Yangwl
/
LJ-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单管理管理模块(优化显示问题)

Browse Source
yangwl
wws 2 years ago
parent 18a9ecf921
commit 7344c017fd
3 changed files with 393 additions and 171 deletions
Show Stats Download Patch File Download Diff File

16
src/api/mes/plan.js
Unescape Escape View File

@ -1,5 +1,21 @@
import request from '@/utils/request' import request from '@/utils/request'
// 通过计划日期获取已分配的料罐、物料、班次信息list
export function getBMSList(planTime) {
return request({
url:'mes/plan/getBMSList/'+'?planTime='+planTime,
method:'get'
})
}
// 获取物料信息list
export function getProductList() {
return request({
url:'/mes/plan/getProductList',
method:'get'
})
}
// 获取料罐信息list // 获取料罐信息list
export function getBucketList() { export function getBucketList() {
return request({ return request({

324
src/views/mes/plan/index.vue
Unescape Escape View File

@ -120,53 +120,96 @@
<!-- 添加或修改湿料计划管理对话框 --> <!-- 添加或修改湿料计划管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<!-- 选择工单生产日期 -->
<el-row>
<el-col :offset="8" :span="8">
<el-date-picker
@change="workOrderTimeChange"
v-model="workOrderTime"
type="date"
placeholder="工单日期">
</el-date-picker>
</el-col>
</el-row>
<!-- 工单列表 -->
<el-row>
<el-table
ref="multipleTable"
v-if="refreshWorkTable"
v-loading="workLoading"
:data="workOrderList"
tooltip-effect="dark"
style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column width="60" align="center" label="序号" type="index" :index="indexMethod"></el-table-column>
<el-table-column prop="workorderCode" label="工单编码" width="120"></el-table-column>
<el-table-column prop="productName" label="产品名称" width="120"></el-table-column>
<el-table-column prop="productDate" label="工单日期" show-overflow-tooltip></el-table-column>
<el-table-column prop="shiftDesc" label="班次" show-overflow-tooltip></el-table-column>
<el-table-column prop="" label="料罐" show-overflow-tooltip></el-table-column>
<el-table-column prop="" label="物料" show-overflow-tooltip></el-table-column>
</el-table>
</el-row>
<!-- 料罐-物料-计划日期的选择 -->
<el-form :model="form" ref="dynamicForm" label-width="80px"> <el-form :model="form" ref="dynamicForm" label-width="80px">
<el-row> <!-- 选择工单生产日期 -->
<!-- 选择料罐 --> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item size="small" label="选择料罐:"> <el-form-item size="small" label="工单日期: ">
<el-select v-model="form.bucketId" placeholder="请选择料罐"> <el-date-picker
<el-option v-for="item in selectBucketList" :key="item.bucketId" :label="item.bucketName" @change="workOrderTimeChange"
:value="item.bucketId"></el-option> v-model="workOrderTime"
</el-select> type="date"
</el-form-item> placeholder="工单日期">
</el-col> </el-date-picker>
</el-row> </el-form-item>
</el-col>
</el-row>
<!-- 工单列表 -->
<el-row>
<el-table
ref="multipleTable"
v-if="refreshWorkTable"
v-loading="workLoading"
:data="workOrderList"
tooltip-effect="dark"
style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column width="60" align="center" label="序号" type="index" :index="indexMethod"></el-table-column>
<el-table-column prop="workorderCode" label="工单编码" width="120"></el-table-column>
<el-table-column prop="productName" label="产品名称" width="120"></el-table-column>
<el-table-column prop="productDate" label="工单日期" show-overflow-tooltip></el-table-column>
<el-table-column prop="shiftDesc" label="班次" show-overflow-tooltip></el-table-column>
<el-table-column prop="" label="料罐" show-overflow-tooltip></el-table-column>
<el-table-column prop="" label="物料" show-overflow-tooltip></el-table-column>
</el-table>
</el-row>
<!-- 料罐-物料-计划日期的选择 -->
<el-row>
<!-- 选择料罐 -->
<el-col :span="8">
<el-form-item size="small" label="选择料罐:">
<el-select v-model="form.bucketId" placeholder="请选择料罐">
<el-option v-for="item in selectBucketList" :key="item.bucketId" :label="item.bucketName"
:value="item.bucketId"></el-option>
</el-select>
</el-form-item>
</el-col>
<!--选择物料 -->
<el-col :span="8">
<el-form-item size="small" label="选择物料:">
<el-select v-model="form.productId" placeholder="请选择物料">
<el-option v-for="item in selectProductList" :key="item.productId" :label="item.productDesc"
:value="item.productId"></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- 选择日期 -->
<el-col :span="8">
<el-form-item size="small" label="计划日期: ">
<el-date-picker @change="checkDate" v-model="form.planTime" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<!-- 确定按钮 -->
<el-row>
<el-col :offset="11" :span="8">
<el-button @click="batchBtn" type="primary">确定</el-button>
</el-col>
</el-row>
<!-- 变化的工单表 -->
<el-row>
<el-table
ref="multipleTable"
v-if="refreshWorkTable"
v-loading="workLoading"
:data="newWorkOrderList"
tooltip-effect="dark"
style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column width="60" align="center" label="序号" type="index" :index="indexMethod"></el-table-column>
<el-table-column prop="workorderCode" label="工单编码" width="120"></el-table-column>
<el-table-column prop="productName" label="产品名称" width="120"></el-table-column>
<el-table-column prop="productDate" label="工单日期" show-overflow-tooltip></el-table-column>
<el-table-column prop="shiftDesc" label="班次" show-overflow-tooltip></el-table-column>
<el-table-column prop="bucketName" label="料罐" show-overflow-tooltip></el-table-column>
<el-table-column prop="materialName" label="物料" show-overflow-tooltip></el-table-column>
</el-table>
</el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">提 交</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -174,12 +217,22 @@
</template> </template>
<script> <script>
import { getBucketList,getWorkOrderList,listPlan, getPlan, delPlan, addPlan, updatePlan } from "@/api/mes/plan"; import { getBMSList,getProductList,getBucketList,getWorkOrderList,listPlan, getPlan, delPlan, addPlan, updatePlan } from "@/api/mes/plan";
export default { export default {
name: "Plan", name: "Plan",
data() { data() {
return { return {
// 校验是否能提交
checkSelect: true,
// selectList
selectList: null,
// 当前计划日期下的BMS
bmsList: null,
// 新增下方的工单表
newWorkOrderList: null,
// 物料的选择list
selectProductList: null,
// 料罐的选择list // 料罐的选择list
selectBucketList: null, selectBucketList: null,
// 上工单遮罩层 // 上工单遮罩层
@ -222,6 +275,8 @@ export default {
// 表单参数 // 表单参数
form: { form: {
bucketId: null, bucketId: null,
productId: null,
planTime: null,
}, },
// 表单校验 // 表单校验
rules: { rules: {
@ -232,8 +287,130 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
/** 新增-提交按钮 */
batchBtn() {
console.log(this.selectProductList)
// 数据判空
if (this.selectList == null || this.selectList === undefined){
this.$message({
message: '请选择工单！',
type: 'warning'
})
return;
}
if (this.form.bucketId == null || this.form.productId == null){
this.$message({
message: '数据不能为空！',
type: 'warning'
})
return;
}
// 数据校验班次冲突问题
if (this.checkSelect === false){
this.$message({
message: '班次冲突请重新选择！',
type: 'warning'
})
return;
}
// 校验数据班次、物料、料罐
var bmsList = this.bmsList;
bmsList.push({
bucketId: this.form.bucketId,
materialId: this.form.productId,
shiftId: this.selectList[0].shiftId,
});
for (let i = 0;i<bmsList.length-1;i++){
for (let j = i;j < bmsList.length-1;j++){
if (bmsList[i].shiftId == bmsList[j].shiftId && bmsList[i].bucketId == bmsList[j].bucketId && bmsList[i].materialId != bmsList[j].materialId){
this.$message({
message: '同班次下-同料罐下:不能混料！',
type: 'warning'
})
return;
}
}
}
// 数据保存（仅前端）
console.log("这里是你先要的数据")
console.log(this.selectList)
console.log(this.selectBucketList)
console.log(this.selectProductList)
// 创建料罐对象
var bucket;
for (let i = 0;i < this.selectBucketList.length-1;i++){
if (this.form.bucketId == this.selectBucketList[i].bucketId){
bucket = this.selectBucketList[i];
}
}
// 创建物料对象
var material;
for (let i = 0;i < this.selectProductList.length-1;i++){
if (this.form.productId == this.selectProductList[i].productId){
material = this.selectProductList[i];
}
}
this.newWorkOrderList = this.selectList;
for (let i = 0; i < this.newWorkOrderList.length-1;i++){
// this.newWorkOrderList[i].
}
// 创建湿料计划详情对象
// var wetMaterialDetail = {
// workorderId: null,
// workorderCode: null,
// productName: null,
// workorderTime: null,
// shiftId: null,
// shiftCode: null,
// shiftDesc: null,
// bucketId: bucket.bucketId,
// bucketCode: bucket.bucketCode,
// bucketName: bucket.bucketName,
// materialId: material.productId,
// materialName: material.productDesc,
// };
// for (let i = 0; i < this.selectList.length-1;i++){
// var workOrder = this.selectList[i];
// wetMaterialDetail.workorderId = workOrder.workorderId;
// wetMaterialDetail.workorderCode = workOrder.workorderCode;
// wetMaterialDetail.productName = workOrder.productName;
// wetMaterialDetail.workorderTime = workOrder.productDate;
// wetMaterialDetail.shiftId = workOrder.shiftId;
// wetMaterialDetail.shiftDesc = workOrder.shiftDesc;
//
// this.wetMaterialDetailList.push(workOrder);
// }
console.log("看这里！！！！")
console.log(this.wetMaterialDetailList)
this.bmsList = bmsList;
this.$message('点击了提交按钮！');
},
/** 校验计划日期 */
checkDate(e){
var now = new Date();
if (e < now){
this.$message({
message: '日期不得早于今天',
type: 'warning'
})
e = now;
this.form.planTime = now;
}
},
/** 新增-选择工单日期 */ /** 新增-选择工单日期 */
workOrderTimeChange(e) { workOrderTimeChange(e) {
// 校验日期并进行计划日期同步
var now = new Date();
if (e < now){
this.form.planTime = now;
}else {
this.form.planTime = e;
}
// 转换日期格式 // 转换日期格式
const year = e.getFullYear(); // 获取年份 const year = e.getFullYear(); // 获取年份
const month = String(e.getMonth() + 1).padStart(2, '0'); // 获取月份 const month = String(e.getMonth() + 1).padStart(2, '0'); // 获取月份
@ -241,6 +418,8 @@ export default {
const productDate = `${year}-${month}-${day}`; const productDate = `${year}-${month}-${day}`;
getWorkOrderList(productDate).then(response => { getWorkOrderList(productDate).then(response => {
console.log("这里是你要的数据")
console.log(response.data)
this.workOrderList = response.data; this.workOrderList = response.data;
// 刷新表格 // 刷新表格
// 在获取到新的数据后执行以下代码 // 在获取到新的数据后执行以下代码
@ -293,11 +472,11 @@ export default {
}; };
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 首-搜索按钮操作 */
handleQuery() { handleQuery() {
console.log("这里是你要的数据"); console.log("这里是你要的数据");
console.log(this.timeList); console.log(this.timeList);
if (this.timeList.length>1){ if (this.timeList.length-1>1){
// 赋值 // 赋值
const year = this.timeList[0].getFullYear(); // 获取年份 const year = this.timeList[0].getFullYear(); // 获取年份
const month = String(this.timeList[0].getMonth() + 1).padStart(2, '0'); // 获取月份 const month = String(this.timeList[0].getMonth() + 1).padStart(2, '0'); // 获取月份
@ -320,7 +499,7 @@ export default {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 首-重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.timeList = []; this.timeList = [];
@ -328,9 +507,23 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) // 初始化
this.single = selection.length!==1 this.checkSelect = true;
this.multiple = !selection.length // 如果选择中班次冲突
for (let i = 0; i < selection.length-1; i++){
if (selection[0].shiftId != selection[i].shiftId){
this.$message({
message: '班次冲突！',
type: 'warning'
});
this.checkSelect = false;
}
}
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
// 将选择的信息放入selectList
this.selectList = selection;
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
@ -339,12 +532,41 @@ export default {
this.selectBucketList = null; this.selectBucketList = null;
this.workOrderTime = null; this.workOrderTime = null;
this.workOrderList = []; this.workOrderList = [];
this.selectProductList = null;
this.newWorkOrderList = null;
this.bmapId = null;
// 数据初始化 // 数据初始化
this.workOrderTime = new Date(); this.workOrderTime = new Date();
this.form.planTime = new Date();
// 获取当前日期下的未被分配的工单list
// 转换日期格式
const year = this.workOrderTime.getFullYear(); // 获取年份
const month = String(this.workOrderTime.getMonth() + 1).padStart(2, '0'); // 获取月份
const day = String(this.workOrderTime.getDate()).padStart(2, '0'); // 获取日期
const productDate = `${year}-${month}-${day}`;
getWorkOrderList(productDate).then(response => {
this.workOrderList = response.data;
// 刷新表格
// 在获取到新的数据后执行以下代码
this.workLoading = true; // 设置加载状态为true，表示正在加载
this.refreshWorkTable = false; // 先将refreshProTable设置为false，隐藏表格
this.$nextTick(() => {
// 使用$nextTick来等待DOM更新完成
this.refreshWorkTable = true; // 立即将refreshProTable设置为true，显示表格
this.workLoading = false; // 设置加载状态为false，表示加载完成
});
})
getBMSList(productDate).then(response => {
this.bmsList = response.data;
})
// 一会完成下方数据同步 // 一会完成下方数据同步
// 获取料罐list // 获取料罐list
getBucketList().then(response => { getBucketList().then(response => {
this.selectBucketList = response.data; this.selectBucketList = response.data;
})
// 获取物料信息list
getProductList().then(response => {
this.selectProductList = response.data;
}) })
this.open = true; this.open = true;
this.title = "新增湿料计划"; this.title = "新增湿料计划";

224
src/views/mes/pro/order/index.vue
Unescape Escape View File

@ -33,6 +33,16 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="拆分状态" prop="prodDesc">
<el-select v-model="queryParams.status" placeholder="请选择">
<el-option
v-for="item in statusOptions"
:key="item.key"
:label="item.value"
:value="item.key">
</el-option>
</el-select>
</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>
@ -52,16 +62,7 @@
>SAP同步 >SAP同步
</el-button> </el-button>
</el-col> </el-col>
<!--
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['order:order:add']"
>新增</el-button>
-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@ -94,27 +95,27 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
> >
<el-table-column label="订单号" align="center" prop="orderCode" width="100"/> <el-table-column width="150" label="订单号" align="center" prop="orderCode" />
<el-table-column label="物料号" align="center" prop="prodCode" width="100"/> <el-table-column width="180" label="物料号" align="center" prop="prodCode" />
<el-table-column label="物料名称" align="center" prop="prodDesc" width="100"/> <el-table-column width="200" label="物料名称" align="center" prop="prodDesc" />
<el-table-column label="订单数量" align="center" prop="quantity"/> <el-table-column width="90" label="订单数量" align="center" prop="quantity"/>
<el-table-column label="单位" align="center" prop="unit"/> <el-table-column width="70" label="单位" align="center" prop="unit"/>
<el-table-column label="任务清单" align="center" prop="workerOrder" width="100"/> <el-table-column label="任务清单" align="center" prop="workerOrder" />
<el-table-column label="计划生产日期" align="center" prop="planProDate" width="100"> <el-table-column width="120" label="计划生产日期" align="center" prop="planProDate" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.planProDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.planProDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="计划完成日期" align="center" prop="planComplete" width="100"> <el-table-column width="120" label="计划完成日期" align="center" prop="planComplete" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.planComplete, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.planComplete, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单状态" align="center" prop="status"/> <el-table-column label="订单状态" align="center" prop="status"/>
<el-table-column label="计划工厂编码" prop="planFactoryCode" width="100px"/> <el-table-column width="100" align="center" label="计划工厂编码" prop="planFactoryCode"/>
<el-table-column label="订单类型" align="center" prop="orderType"/> <el-table-column label="订单类型" align="center" prop="orderType"/>
<el-table-column label="产品类型" align="center" prop="prodType"/> <el-table-column label="产品类型" align="center" prop="prodType"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -129,9 +130,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 添加或修改订单对话框 -->
<!-- 拆分模块 --> <!-- 拆分模块 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body> <el-dialog :title="title" :visible.sync="splitOpen" width="1000px" append-to-body>
<!-- 拆分头pro --> <!-- 拆分头pro -->
<el-table <el-table
border border
@ -144,18 +144,19 @@
<el-table-column width="60" align="center" label="序号" type="index" :index="indexMethod"></el-table-column> <el-table-column width="60" align="center" label="序号" type="index" :index="indexMethod"></el-table-column>
<el-table-column width="150" label="订单编号" prop="orderCode"/> <el-table-column width="150" label="订单编号" prop="orderCode"/>
<el-table-column width="380" label="产品名称" align="center" prop="prodDesc"/> <el-table-column width="380" label="产品名称" align="center" prop="prodDesc"/>
<el-table-column width="60" label="单位" align="center" prop="unit"/>
<el-table-column width="130" label="产品数量" align="center" prop="quantity"/> <el-table-column width="130" label="产品数量" align="center" prop="quantity"/>
<el-table-column label="已拆分数量" align="center" prop="quantitySplit"/> <el-table-column label="已拆分数量" align="center" prop="quantitySplit"/>
<el-table-column label="拆分数量" align="center" prop="atrr1"/> <el-table-column label="拆分数量" align="center" prop="atrr1"/>
</el-table> </el-table>
<el-form class="my-margin" :model="form" ref="dynamicForm" label-width="80px"> <el-form class="my-margin" :model="splitForm" ref="dynamicForm" label-width="80px">
<!-- 编辑框 --> <!-- 编辑框 -->
<!-- 第一行 --> <!-- 第一行 -->
<el-row> <el-row>
<!-- 选择产线 --> <!-- 选择产线 -->
<el-col :span="6"> <el-col :span="6">
<el-form-item label="选择机型:"> <el-form-item label="选择机型:">
<el-select size="small" v-model="form.prodLineCode" placeholder="请选择成型机"> <el-select size="small" v-model="splitForm.prodLineCode" placeholder="请选择成型机">
<el-option v-for="item in proline" :key="item.key" :label="item.label" :value="item.key"></el-option> <el-option v-for="item in proline" :key="item.key" :label="item.label" :value="item.key"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -163,13 +164,13 @@
<!-- 拆分数量 --> <!-- 拆分数量 -->
<el-col :offset="2" :span="7"> <el-col :offset="2" :span="7">
<el-form-item size="small" label="拆分数量:"> <el-form-item size="small" label="拆分数量:">
<el-input required type="number" @input="splitNumChange" v-model="form.splitNum"></el-input> <el-input required type="number" @input="splitNumChange" v-model="splitForm.splitNum"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- 工单日期 --> <!-- 工单日期 -->
<el-col :offset="1" :span="5"> <el-col :offset="1" :span="5">
<el-form-item size="small" label="工单日期: "> <el-form-item size="small" label="工单日期: ">
<el-date-picker @change="checkDate" v-model="form.productDate" type="date" placeholder="选择日期"></el-date-picker> <el-date-picker @change="checkDate" v-model="splitForm.productDate" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -178,7 +179,7 @@
<el-col :span="6"> <el-col :span="6">
<!-- 选择班次 --> <!-- 选择班次 -->
<el-form-item size="small" label="选择班次:" class="my-select my-first"> <el-form-item size="small" label="选择班次:" class="my-select my-first">
<el-select v-model="form.shiftId" placeholder="请选择班次"> <el-select v-model="splitForm.shiftId" placeholder="请选择班次">
<el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc" <el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc"
:value="item.shiftId"></el-option> :value="item.shiftId"></el-option>
</el-select> </el-select>
@ -207,12 +208,6 @@
</el-button> </el-button>
</el-col> </el-col>
</el-row> </el-row>
<!-- 第四行 -->
<el-row>
<el-col :offset="11" :span="8">
<el-button @click="batchBtn" type="primary">提交</el-button>
</el-col>
</el-row>
</el-form> </el-form>
<!-- 拆分尾 --> <!-- 拆分尾 -->
<el-table <el-table
@ -227,12 +222,13 @@
<el-table-column width="300" align="center" prop="workorderCode" label="工单号"></el-table-column> <el-table-column width="300" align="center" prop="workorderCode" label="工单号"></el-table-column>
<el-table-column width="120" align="center" prop="prodLineCode" label="成型机"></el-table-column> <el-table-column width="120" align="center" prop="prodLineCode" label="成型机"></el-table-column>
<el-table-column width="120" align="center" prop="quantitySplit" label="数量"></el-table-column> <el-table-column width="120" align="center" prop="quantitySplit" label="数量"></el-table-column>
<el-table-column width="60" label="单位" align="center" prop="unit"/>
<el-table-column align="center" prop="batchCodeList" label="批次号"></el-table-column> <el-table-column align="center" prop="batchCodeList" label="批次号"></el-table-column>
</el-table> </el-table>
<!-- 测试 --> <!-- 测试 -->
<!-- 操作按钮 --> <!-- 操作按钮 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel">关 闭</el-button> <el-button type="primary" @click="batchBtn">提 交</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -244,7 +240,6 @@
getWorkOrderList, getWorkOrderList,
getOrderList, getOrderList,
subSplitOrder, subSplitOrder,
getConvert,
getprodLineShift, getprodLineShift,
listOrder, listOrder,
getOrder, getOrder,
@ -262,7 +257,14 @@
}, },
data() { data() {
return { return {
// 拆分状态选择
statusOptions:[{
key:1,
value:"已拆分"
},{
key:0,
value:"未拆分"
}],
//以下为新内容 //以下为新内容
productList:[], productList:[],
//工单遮罩层 //工单遮罩层
@ -292,8 +294,6 @@
batchCode: '', batchCode: '',
batchQuantity: '' batchQuantity: ''
}], }],
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 显示搜索条件 // 显示搜索条件
@ -305,13 +305,14 @@
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, splitOpen: false,
// 是否展开，默认全部展开 // 是否展开，默认全部展开
isExpandAll: true, isExpandAll: true,
// 重新渲染表格状态 // 重新渲染表格状态
refreshTable: true, refreshTable: true,
// 查询参数 // 查询参数
queryParams: { queryParams: {
status: null,
planFactoryCode: null, planFactoryCode: null,
orderType: null, orderType: null,
orderCode: null, orderCode: null,
@ -330,7 +331,7 @@
prodType: null prodType: null
}, },
// 拆分表单参数 // 拆分表单参数
form: { splitForm: {
id: null, id: null,
prodLineCode: null, prodLineCode: null,
splitNum: null, splitNum: null,
@ -339,13 +340,34 @@
formFields: [], formFields: [],
}, },
// 表单校验 // 表单校验
rules: {} rules: {},
addrules: {}
}; };
}, },
created() { created() {
this.getList(); this.getList();
}, },
methods: { methods: {
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateOrder(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addOrder(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 检验批次编码是否重复 */ /** 检验批次编码是否重复 */
batchCodeChange(e){ batchCodeChange(e){
for (let i = 1; i < this.formFields.length;i++){ for (let i = 1; i < this.formFields.length;i++){
@ -366,13 +388,13 @@
var now = new Date(); var now = new Date();
if (e < now){ if (e < now){
e = now; e = now;
this.form.productDate = now; this.splitForm.productDate = now;
} }
}, },
/** 拆分提交按钮 */ /** 拆分提交按钮 */
batchBtn() { batchBtn() {
// 判断数据不能为空 // 判断数据不能为空
if (this.form.splitNum == null || this.form.shiftId == null || this.form.prodLineCode == null){ if (this.splitForm.splitNum == null || this.splitForm.shiftId == null || this.splitForm.prodLineCode == null){
this.$message({ this.$message({
message:'数据不能为空！', message:'数据不能为空！',
type:'warning' type:'warning'
@ -399,15 +421,15 @@
return; return;
} }
//整理订单传入到后端 //整理订单传入到后端
this.form.formFields = this.formFields; this.splitForm.formFields = this.formFields;
//整理数据往后端发送 //整理数据往后端发送
//下面是请求处理 //下面是请求处理
const data = { const data = {
formFields : this.formFields, formFields : this.formFields,
prodLineCode : this.form.prodLineCode, prodLineCode : this.splitForm.prodLineCode,
productDate : this.form.productDate, productDate : this.splitForm.productDate,
shiftId : this.form.shiftId, shiftId : this.splitForm.shiftId,
splitNum : this.form.splitNum, splitNum : this.splitForm.splitNum,
product : this.productData[0], product : this.productData[0],
} }
@ -423,7 +445,7 @@
let id = this.productData[0].id; let id = this.productData[0].id;
// 清除缓存 // 清除缓存
this.form = { this.splitForm = {
id: null, id: null,
prodLineCode: null, prodLineCode: null,
splitNum: null, splitNum: null,
@ -471,8 +493,9 @@
if (check){ if (check){
setTimeout(() => { setTimeout(() => {
this.resetQuery();
// 等待1秒后执行的代码 // 等待1秒后执行的代码
this.open = false; this.splitOpen = false;
}, 500); }, 500);
} }
}, },
@ -487,22 +510,6 @@
} }
}); });
}, },
removeDomain(item) {
var index = this.dynamicValidateForm.domains.indexOf(item)
if (index !== -1) {
this.dynamicValidateForm.domains.splice(index, 1)
}
},
addDomain() {
this.dynamicValidateForm.domains1.push({
value: '',
key: Date.now()
})
this.dynamicValidateForm.domains.push({
value: '',
key: Date.now()
});
},
/** 动态添加表单 */ /** 动态添加表单 */
addField() { addField() {
//如果批次数量大于等于拆分数量则不允许拆分 //如果批次数量大于等于拆分数量则不允许拆分
@ -557,12 +564,13 @@
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.splitOpen = false;
this.open = false; this.open = false;
this.reset(); this.reset();
}, },
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.splitForm = {
id: null, id: null,
planFactoryCode: null, planFactoryCode: null,
orderType: null, orderType: null,
@ -589,7 +597,7 @@
}, },
/** 拆分表单重置 */ /** 拆分表单重置 */
resetBatch() { resetBatch() {
this.form = { this.splitForm = {
id: null, id: null,
prodLineCode: null, prodLineCode: null,
splitNum: null, splitNum: null,
@ -623,11 +631,11 @@
this.reset(); this.reset();
this.getTreeselect(); this.getTreeselect();
if (row != null && row.orderCode) { if (row != null && row.orderCode) {
this.form.parentOrder = row.orderCode; this.splitForm.parentOrder = row.orderCode;
} else { } else {
this.form.parentOrder = 0; this.splitForm.parentOrder = 0;
} }
this.open = true; this.splitOpen = true;
this.title = "拆分"; this.title = "拆分";
}, },
/** 展开/折叠操作 */ /** 展开/折叠操作 */
@ -643,44 +651,14 @@
this.reset(); this.reset();
this.getTreeselect(); this.getTreeselect();
if (row != null) { if (row != null) {
this.form.parentOrder = row.orderCode; this.splitForm.parentOrder = row.orderCode;
} }
getOrder(row.id).then(response => { getOrder(row.id).then(response => {
this.form = response.data; this.splitForm = response.data;
this.open = true; this.splitOpen = true;
this.title = "修改订单"; this.title = "修改订单";
}); });
}, },
/** 提交按钮 */
submitFormbak() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateOrder(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addOrder(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDeletebak(row) {
this.$modal.confirm('是否确认删除订单编号为"' + row.id + '"的数据项？').then(function () {
return delOrder(row.id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
},
/** 拆分按钮操作 */ /** 拆分按钮操作 */
splitBtn(row) { splitBtn(row) {
//数据初始化 //数据初始化
@ -706,7 +684,7 @@
//将数据放入到productData中 //将数据放入到productData中
this.productData.push(row); this.productData.push(row);
//存放id //存放id
this.form.id = row.id; this.splitForm.id = row.id;
this.refreshProTable = false; // 先将refreshProTable设置为false，隐藏表格 this.refreshProTable = false; // 先将refreshProTable设置为false，隐藏表格
this.$nextTick(() => { this.$nextTick(() => {
// 使用$nextTick来等待DOM更新完成 // 使用$nextTick来等待DOM更新完成
@ -714,22 +692,28 @@
this.proLoading = false; // 设置加载状态为false，表示加载完成 this.proLoading = false; // 设置加载状态为false，表示加载完成
}); });
//初始化日期为默认今天 //初始化日期为默认今天
this.form.productDate = new Date(); this.splitForm.productDate = new Date();
//获取成型机和班次 //获取成型机和班次
getprodLineShift().then(response => { getprodLineShift().then(response => {
this.proline = response.data.lines; this.proline = response.data.lines;
this.workShift = response.data.shifts; this.workShift = response.data.shifts;
}); });
//获取换算值 //获取换算值
getConvert().then(response => { if (row.children !== undefined){
for (let i = 0; i < response.data.length; i++) { this.secConvert = Number(row.children[0].quantity) / Number(row.quantity);
if (response.data[i].dictSort == 2) { if (row.children[0].children !== undefined){
this.secConvert = response.data[i]; this.thiConvert = Number(row.children[0].children[0].quantity) / Number(row.quantity);
} else if (response.data[i].dictSort == 3) {
this.thiConvert = response.data[i];
}
} }
}) }
// getConvert().then(response => {
// for (let i = 0; i < response.data.length; i++) {
// if (response.data[i].dictSort == 2) {
// this.secConvert = response.data[i];
// } else if (response.data[i].dictSort == 3) {
// this.thiConvert = response.data[i];
// }
// }
// })
// 获取工单 // 获取工单
@ -745,7 +729,7 @@
this.splitData = data; this.splitData = data;
}) })
this.open = true; this.splitOpen = true;
this.title = "拆分"; this.title = "拆分";
}, },
/** 拆分数量方法 */ /** 拆分数量方法 */
@ -754,7 +738,7 @@
//不能为负数 //不能为负数
if (e <= 0) { if (e <= 0) {
e = 1; e = 1;
this.form.splitNum = 1; this.splitForm.splitNum = 1;
} }
if (e != '' && e > 0) { if (e != '' && e > 0) {
let max = Number(this.productData[0].quantity) - Number(this.productData[0].quantitySplit); let max = Number(this.productData[0].quantity) - Number(this.productData[0].quantitySplit);
@ -763,21 +747,21 @@
message: "最大值不能超过" + max + "!", message: "最大值不能超过" + max + "!",
type: 'warning' type: 'warning'
}) })
this.form.splitNum = max; this.splitForm.splitNum = max;
} }
//前端数据同步 //前端数据同步
// 在获取到新的数据后执行以下代码 // 在获取到新的数据后执行以下代码
this.proLoading = true; // 设置加载状态为true，表示正在加载 this.proLoading = true; // 设置加载状态为true，表示正在加载
//一级 //一级
this.productData[0].atrr1 = this.form.splitNum; this.productData[0].atrr1 = this.splitForm.splitNum;
//二级 //二级
if (this.productData[0].children !== undefined) { if (this.productData[0].children !== undefined) {
for (let i = 0; i < this.productData[0].children.length; i++) { for (let i = 0; i < this.productData[0].children.length; i++) {
this.productData[0].children[i].atrr1 = Number(this.form.splitNum) * Number(this.secConvert.dictValue); this.productData[0].children[i].atrr1 = Number(this.splitForm.splitNum) * Number(this.secConvert);
//三级 //三级
if (this.productData[0].children[i].children !== undefined) { if (this.productData[0].children[i].children !== undefined) {
for (let j = 0; j < this.productData[0].children[i].children.length; j++) { for (let j = 0; j < this.productData[0].children[i].children.length; j++) {
this.productData[0].children[i].children[j].atrr1 = Number(this.form.splitNum) * Number(this.secConvert.dictValue) * Number(this.thiConvert.dictValue); this.productData[0].children[i].children[j].atrr1 = Number(this.splitForm.splitNum) * Number(this.secConvert) * Number(this.thiConvert);
} }
} }
} }

Write Preview
Loading…
Cancel
Save