Skip to content

M
mes-ui
Commit 39dc1849 authored by chenzj's avatar chenzj
Browse files
Options

领料申请界面优化

parent f8be8249
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 40 deletions
src/views/mes/pro/request/components/arangeSelect.vue
View file @ 39dc1849
......@@ -80,6 +80,10 @@
btnShow: false
},
watch: {
workorderId(v){
this.queryParams.workorderId = v;
this.getList();
},
arrangeCode(v){
this.queryParams.arrangeCode = v;
this.getList();
......@@ -115,7 +119,7 @@
arrangeCode: null,
taskName: null,
workorderId: this.workorderId,
workorderCode: this.workorderCode,
workorderCode: null,
workorderName: null,
workstationId: null,
workstationCode: null,
......
src/views/mes/pro/request/components/requestIndex.vue
View file @ 39dc1849
......@@ -12,6 +12,7 @@
<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>
<el-button size="mini" type="text" icon="el-icon-update" @click="updateRow($index)">修改</el-button>
</template>
</el-table-column>
</el-table>
......@@ -63,12 +64,13 @@
</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-form-item label="申请数量" prop="applyNum">
<el-input-number v-model="form.applyNum" :min="0" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -116,7 +118,9 @@ export default {
// 显示搜索条件
showSearch: true,
optType: "add",
optType: "",
indexs: null,
// 总条数
total: 0,
// 刀模版物料申请单表格数据
......@@ -210,10 +214,23 @@ export default {
/**表单提交 */
submitForm() {
if(this.form.sapItemCode==null){
this.open=true;
this.$modal.confirm('物料编码不能为空');
return;
}
if(this.form.applyNum==0){
this.open=true;
this.$modal.confirm('申请数量需要输入数字');
return;
}
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.optType == "add") {
this.tableData.unshift({ ...this.form });
}else if(this.optType == "edit"){
this.tableData[this.indexs]=JSON.parse(JSON.stringify(this.form));
}
this.showFlag = false;
}
......@@ -245,6 +262,15 @@ export default {
deleteRow(index) {
this.tableData.splice(index, 1);
},
/**修改*/
updateRow(index){
console.log(index);
this.indexs=index;
this.form = this.tableData[index];
this.open = true;
this.optType = "edit";
},
handleRemove(row, index) {
console.log(row, index)
......
src/views/mes/pro/request/components/taskSelect.vue
View file @ 39dc1849
......@@ -94,6 +94,7 @@
watch: {
workorderId(v){
this.queryParams.workorderId = v;
this.getList();
},
arrangeCode(v){
this.queryParams.arrangeCode = v;
......
src/views/mes/pro/request/components/workorderSelect.vue
View file @ 39dc1849
......@@ -104,8 +104,7 @@
components: {},
dicts: ['mes_order_status','mes_workorder_sourcetype'],
props:{
arrangeCode: undefined,
workorderCode: undefined
},
watch: {
arrangeCode(v){
......@@ -143,7 +142,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
workorderCode: this.workorderCode,
workorderCode: null,
workorderName: null,
workorderType: null,
orderSource: null,
......@@ -154,7 +153,7 @@
productSpc: null,
unitOfMeasure: null,
quantity: null,
arrangeCode: this.arrangeCode,
arrangeCode: null,
quantityProduced: null,
quantityChanged: null,
quantityScheduled: null,
......
src/views/mes/pro/request/index.vue
View file @ 39dc1849
......@@ -264,9 +264,9 @@
</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"
<el-form-item label="工单号" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请输入编排单号" >
<el-button slot="append" icon="el-icon-search" @click="$refs.workorderselect.showFlag = true"
:disabled="form.materialRequestId"></el-button>
</el-input>
</el-form-item>
......@@ -282,18 +282,18 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工单号" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请输入编排单号" >
<el-button slot="append" icon="el-icon-search" @click="$refs.workorderselect.showFlag = true"
<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.materialRequestId"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
<BrandSelect ref="brSelect" :arrangeCode="form.arrangeCode" @onSelected="(row)=>onSelected(row, 'BrandSelect')"></BrandSelect>
<arangeSelect ref="arangeSelect" key="arangeSelect" :arrangeCode="form.arrangeCode" @onSelected="(row)=>onSelected(row, 'arangeSelect')"></arangeSelect>
<workorderSelect ref="workorderselect" key="workorderselect" :arrangeCode="form.arrangeCode" :workorderCode="form.workorderCode" @onSelected="(row)=>onSelected(row, 'workorderSelect')"></workorderSelect>
<BrandSelect ref="brSelect" :workorderId="form.workorderId" :arrangeCode="form.arrangeCode" @onSelected="(row)=>onSelected(row, 'BrandSelect')"></BrandSelect>
<arangeSelect ref="arangeSelect" :workorderId="form.workorderId" :arrangeCode="form.arrangeCode" @onSelected="(row)=>onSelected(row, 'arangeSelect')"></arangeSelect>
<workorderSelect ref="workorderselect" key="workorderselect" @onSelected="onWorkorderSelect"></workorderSelect>
<el-row>
<el-col :span="12">
<el-form-item label="申请时间" prop="createTime">
......@@ -302,16 +302,6 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="领料方式" prop="materialType">
<el-select :disabled="mode == 'make'" v-model="form.materialType" placeholder="请选择领料方式">
<el-option v-for="dict in dict.type.pro_material_from" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<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"
......@@ -319,10 +309,13 @@
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="预计结束时间" prop="endTime">
<el-date-picker clearable v-model="form.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择需预计结束时间" disabled>
placeholder="请选择需预计结束时间" >
</el-date-picker>
</el-form-item>
</el-col>
......@@ -365,6 +358,7 @@ import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.
import ItemSelect from "@/components/itemSelect/single.vue";
import { listWorkunit} from "@/api/mes/md/workunit";
import requestItems from "@/components/request/requestItem.vue";
import dayjs from 'dayjs';
export default {
directives: { print },
name: "MaterialRequest",
......@@ -512,6 +506,10 @@ export default {
this.printloading = false;
})
},
setDate() {
this.form.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
},
showCombDetail(applyNo) {
this.$refs.requestitemsref.showFlag = true;
......@@ -522,26 +520,30 @@ export default {
},
onSelected(row, type) {
if (row != undefined && row != null) {
if (type === 'workorderSelect') {
this.$set(this.form,'workorderCode',row.workorderCode)
} else if (type === 'BrandSelect') {
if (type === 'BrandSelect') {
this.form.taskId = row.taskId;
this.form.taskCode = row.taskCode;
this.form.arrangeCode = row.arrangeCode;
this.form.workorderCode = ''
this.form.taskName = row.taskName;
this.form.arrangeCode = row.arrangeCode;
this.form.startTime = row.scheduleStartDate;
this.$set(this.form,'endTime',row.scheduleEndDate)
} else if (type === 'arangeSelect') {
this.form.taskCode = ''
this.form.taskId = ''
this.form.arrangeCode = row.arrangeCode;
this.form.taskName = '';
this.form.workorderCode = ''
}
}
}
},
onWorkorderSelect(row){
if (row != undefined && row != null) {
this.$set(this.form,'workorderCode',row.workorderCode)
this.form.workorderId=row.workorderId;
this.form.taskCode = '';
this.form.taskId = '';
this.form.arrangeCode = '';
this.form.taskName = '';
}
},
handleItemSelect() {
this.$refs.ItemSelect.showFlag = true;
},
......@@ -674,6 +676,7 @@ export default {
this.reset();
this.opens = true;
this.gCode();
this.setDate();
this.title = "添加领料申请";
this.optType = "add";
},
......
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