Skip to content

P
pda-ui
Commit 72bead2f authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

领料申请

parent 82d33f60
Hide whitespace changes
Inline Side-by-side
Showing with 578 additions and 26 deletions
src/components/TaskSelect/sngle.vue
View file @ 72bead2f
......@@ -87,11 +87,16 @@
processCode: null,
workstationId: null,
workstationCode: null,
arrangeCode: null,
btnShow: false
},
watch: {
workorderId(v){
this.queryParams.workorderId = v;
},
arrangeCode(v){
this.queryParams.arrangeCode = v;
this.getList();
}
},
data() {
......@@ -119,6 +124,7 @@
open: false,
// 查询参数
queryParams: {
arrangeCode: null,
pageNum: 1,
pageSize: 10,
taskCode: null,
......@@ -198,6 +204,7 @@
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams.arrangeCode = null
this.resetForm("queryForm");
this.handleQuery();
},
......
src/components/workstationSelect/simpletableSingle.vue
View file @ 72bead2f
......@@ -129,6 +129,10 @@ export default {
type: Number | undefined,
default: undefined,
}, //外部传入的工序过滤条件
workstationCode: {
type: Number | undefined,
default: undefined,
},
},
created() {
this.getList();
......@@ -143,6 +147,13 @@ export default {
},
immediate: true,
},
workstationCode: {
handler(val) {
this.queryParams.workstationCode = val;
this.getList();
},
immediate: true,
},
},
methods: {
/** 查询工作中心列表 */
......
src/views/mes/pro/request/components/arangeSelect.vue 0 → 100644
View file @ 72bead2f
<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="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.taskCode + scope.row.arrangeCode" @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 { 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/request/components/codeSelect.vue 0 → 100644
View file @ 72bead2f
<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="workstationCode">
<el-input v-model="queryParams.workstationCode" placeholder="请输入工作中心编号" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="工作中心名称" label-width="120" prop="workstationName">
<el-input v-model="queryParams.workstationName" placeholder="请输入工作中心编号" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="所属工序" label-width="120" prop="processName">
<el-input v-model="queryParams.processName" placeholder="请输入工作中心编号" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="所在车间" prop="workshopName">
<el-select v-model="queryParams.workshopId" placeholder="请选择车间">
<el-option v-for="item in workshopOptions" :key="item.workshopId" :label="item.workshopName"
:value="item.workshopId"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</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="workstationCode">
</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="workshopName" />
<el-table-column label="所属工序" align="center" prop="processName" />
<el-table-column label="备注" align="center" prop="remark" />
</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 { listWorkunit} 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;
listWorkunit(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/request/index.vue
View file @ 72bead2f
......@@ -149,11 +149,15 @@
</el-input>
</el-form-item>
</el-col>
<BrandSelect ref="brSelect" @onSelected="onBrandSelected"></BrandSelect>
<BrandSelect ref="brSelect" :arrangeCode="form.arrangeCode" @onSelected="onBrandSelected"></BrandSelect>
<arangeSelect ref="arangeSelect" :arrangeCode="form.arrangeCode" @onSelected="onBrandSelected"></arangeSelect>
<el-col :span="8">
<el-form-item label="编排单号" prop="arrangeCode">
<el-input v-model="form.arrangeCode" placeholder="请输入编排单号" />
</el-form-item>
<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.materialRequestId"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
......@@ -186,17 +190,14 @@
</el-input>
</el-form-item>
</el-col>
<WorkstationSelect ref="workstationSelect" @onSelected="onWorkstationSelect"></WorkstationSelect>
<WorkstationSelect ref="workstationSelect" :workstationCode="form.workstationCode" @onSelected="val => onWorkstationSelect(val, 'workstation')"></WorkstationSelect>
<codeSelect ref="codeSelect" :workstationId="form.workstationId" @onSelected="val => onWorkstationSelect(val, 'unit')"></codeSelect>
<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 label="工作单元" prop="workunitName">
<el-input v-model="form.workunitName" placeholder="工作单元" >
<el-button slot="append" icon="el-icon-search" @click="$refs.codeSelect.showFlag = true"
:disabled="form.materialRequestId"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -236,12 +237,15 @@
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 arangeSelect from "./components/arangeSelect.vue";
import codeSelect from "./components/codeSelect.vue";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
import { listWorkunit} from "@/api/mes/md/workunit";
export default {
name: "MaterialRequest",
components: { BrandSelect,WorkstationSelect,ItemSelect },
components: { BrandSelect,WorkstationSelect,ItemSelect, arangeSelect, codeSelect },
dicts: ['pro_requisition_type', 'pro_material_from', 'sys_yes_no'],
data() {
return {
......@@ -304,7 +308,6 @@ export default {
this.getList();
},
methods: {
handleBrandSelect() {
this.$refs.brSelect.showFlag = true;
},
......@@ -332,17 +335,20 @@ export default {
handleWorkstationSelect() {
this.$refs.workstationSelect.showFlag = true;
},
onWorkstationSelect(row) {
onWorkstationSelect(row, type) {
console.log('row', type, 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);
if(type === 'unit') {
// this.form.workunitName = row.workunitName
this.$set(this.form, 'workunitName', row.workunitName)
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;
}
}
},
......
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