Merge remote-tracking branch 'origin/master'

master
Yangwl 3 months ago
commit 6517fde85d

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询成型机产量列表
export function listProducted(query) {
return request({
url: '/mes/producted/list',
method: 'get',
params: query
})
}
// 查询成型机产量详细
export function getProducted(workorderCode) {
return request({
url: '/mes/producted/' + workorderCode,
method: 'get'
})
}
// 新增成型机产量
export function addProducted(data) {
return request({
url: '/mes/producted',
method: 'post',
data: data
})
}
// 修改成型机产量
export function updateProducted(data) {
return request({
url: '/mes/producted',
method: 'put',
data: data
})
}
// 删除成型机产量
export function delProducted(workorderCode) {
return request({
url: '/mes/producted/' + workorderCode,
method: 'delete'
})
}

@ -9,11 +9,11 @@ export function listOdsRawOrderIn(query) {
});
}
// 报检报表查询接口
export function listZJ(data) {
export function listZJ(query) {
return request({
url: '/wms/odsRawOrderIn/listZJ',
method: 'post',
data: data
method: 'get',
params: query
});
}
// 查询包材到货单详细

@ -0,0 +1,357 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="工单号" prop="workorderCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.workorderCode"-->
<!-- placeholder="请输入工单号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="机台编码" prop="workorderName">
<el-input
v-model="queryParams.workorderName"
placeholder="请输入机台编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="备用1" prop="attr1">-->
<!-- <el-input-->
<!-- v-model="queryParams.attr1"-->
<!-- placeholder="请输入备用1"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="工单日期" prop="productDateArray">-->
<!-- <el-date-picker-->
<!-- v-model="queryParams.createTime"-->
<!-- format="yyyy-MM-dd"-->
<!-- type="daterange"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item label="生产日期" prop="createTime">
<el-date-picker
v-model="dateRange"
format="yyyy-MM-dd HH:mm:00"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="备用2" prop="attr2">-->
<!-- <el-input-->
<!-- v-model="queryParams.attr2"-->
<!-- placeholder="请输入备用2"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用2" prop="attr3">-->
<!-- <el-input-->
<!-- v-model="queryParams.attr3"-->
<!-- placeholder="请输入备用2"-->
<!-- 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-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="['system:producted:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['system:producted:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['system:producted:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['system:producted:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
<!-- </el-row>-->
<el-table v-loading="loading" :data="productedList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="工单号" align="center" prop="workorderCode" />
<el-table-column label="机台编码" align="center" prop="workorderName" />
<el-table-column label="产品编码" align="center" prop="productCode" />
<el-table-column label="产品名称" align="center" prop="productName" />
<!-- <el-table-column label="班次" align="center" prop="shiftId" />-->
<el-table-column label="班次" align="center">
<template slot-scope="scope">
{{ scope.row.shiftId === '5' ? '白班' : (scope.row.shiftId === '2' ? '夜班' : scope.row.shiftId) }}
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" />
<!-- <el-table-column label="操作" align="center" 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="['system:producted:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['system:producted: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"
/>
<!-- 添加或修改成型机产量对话框 -->
<!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>-->
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
<!-- <el-form-item label="工单号" prop="workorderCode">-->
<!-- <el-input v-model="form.workorderCode" placeholder="请输入工单号" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="机台编码" prop="workorderName">-->
<!-- <el-input v-model="form.workorderName" placeholder="请输入机台编码" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用1" prop="attr1">-->
<!-- <el-input v-model="form.attr1" placeholder="请输入备用1" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用2" prop="attr2">-->
<!-- <el-input v-model="form.attr2" placeholder="请输入备用2" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用2" prop="attr3">-->
<!-- <el-input v-model="form.attr3" placeholder="请输入备用2" />-->
<!-- </el-form-item>-->
<!-- </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>-->
</div>
</template>
<script>
import { listProducted, getProducted, delProducted, addProducted, updateProducted } from "@/api/mes/producted";
export default {
name: "Producted",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
productedList: [],
//
title: "",
//
open: false,
dateRange: [this.getStartOfDay(), this.getEndOfDay()], //
//
queryParams: {
pageNum: 1,
pageSize: 10,
workorderCode: null,
workorderName: null,
productName: null,
shiftId: null,
productCode: null,
createTime: null,
beginTime: null, //
endTime: null //
},
//
form: {},
//
rules: {
}
};
},
created() {
this.getList();
},
methods: {
//
getStartOfDay() {
const date = new Date();
date.setHours(0, 0, 0, 0);
return date;
},
//
getEndOfDay() {
const date = new Date();
date.setHours(23, 59, 59, 999);
return date;
},
/** 查询成型机产量列表 */
getList() {
this.loading = true;
if (this.dateRange && this.dateRange.length === 2) {
//
const formatDate = (date) => {
const offset = date.getTimezoneOffset() * 60000;
const localDate = new Date(date.getTime() - offset);
return localDate.toISOString().replace('T', ' ').substring(0, 19);
};
this.queryParams.beginTime = formatDate(this.dateRange[0]);
this.queryParams.endTime = formatDate(this.dateRange[1]);
} else {
this.queryParams.beginTime = null;
this.queryParams.endTime = null;
}
listProducted(this.queryParams).then(response => {
this.productedList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
workorderCode: null,
workorderName: null,
createTime: null,
attr1: null,
attr2: null,
attr3: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.workorderCode)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
// handleAdd() {
// this.reset();
// this.open = true;
// this.title = "";
// },
// /** */
// handleUpdate(row) {
// this.reset();
// const workorderCode = row.workorderCode || this.ids
// getProducted(workorderCode).then(response => {
// this.form = response.data;
// this.open = true;
// this.title = "";
// });
// },
// /** */
// submitForm() {
// this.$refs["form"].validate(valid => {
// if (valid) {
// if (this.form.workorderCode != null) {
// updateProducted(this.form).then(response => {
// this.$modal.msgSuccess("");
// this.open = false;
// this.getList();
// });
// } else {
// addProducted(this.form).then(response => {
// this.$modal.msgSuccess("");
// this.open = false;
// this.getList();
// });
// }
// }
// });
// },
// /** */
// handleDelete(row) {
// const workorderCodes = row.workorderCode || this.ids;
// this.$modal.confirm('"' + workorderCodes + '"').then(function() {
// return delProducted(workorderCodes);
// }).then(() => {
// this.getList();
// this.$modal.msgSuccess("");
// }).catch(() => {});
// },
/** 导出按钮操作 */
handleExport() {
this.download('system/producted/export', {
...this.queryParams
}, `producted_${new Date().getTime()}.xlsx`)
}
}
};
</script>

@ -432,7 +432,7 @@ export default {
/** 查询包材到货单列表 */
getList() {
this.loading = true;
listZJ(JSON.stringify(this.queryParams)).then(response => {
listZJ(this.queryParams).then(response => {
this.odsRawOrderInList = response.rows;
this.total = response.total;
this.loading = false;

Loading…
Cancel
Save