Commit e5d918d9 authored by tanjunxin's avatar tanjunxin

fix: 领料申请新增单号联动逻辑修改

parent 7ca6414f
...@@ -271,6 +271,7 @@ ...@@ -271,6 +271,7 @@
<el-button slot="append" icon="el-icon-search" @click="$refs.workorderselect.showFlag = true" <el-button slot="append" icon="el-icon-search" @click="$refs.workorderselect.showFlag = true"
:disabled="form.materialRequestId"></el-button> :disabled="form.materialRequestId"></el-button>
</el-input> </el-input>
<workorderSelect ref="workorderselect" key="workorderselect" @onSelected="onWorkorderSelect"></workorderSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -281,6 +282,7 @@ ...@@ -281,6 +282,7 @@
<el-button slot="append" icon="el-icon-search" @click="$refs.arangeSelect.showFlag = true" <el-button slot="append" icon="el-icon-search" @click="$refs.arangeSelect.showFlag = true"
:disabled="form.materialRequestId"></el-button> :disabled="form.materialRequestId"></el-button>
</el-input> </el-input>
<arangeSelect ref="arangeSelect" :workorderId="form.workorderId" :arrangeCode="form.arrangeCode" @onSelected="(row)=>onSelected(row, 'arangeSelect')"></arangeSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -289,13 +291,10 @@ ...@@ -289,13 +291,10 @@
<el-button slot="append" icon="el-icon-search" @click="handleBrandSelect" <el-button slot="append" icon="el-icon-search" @click="handleBrandSelect"
:disabled="form.materialRequestId"></el-button> :disabled="form.materialRequestId"></el-button>
</el-input> </el-input>
<BrandSelect ref="brSelect" :workorderId="form.workorderId" :arrangeCode="form.arrangeCode" @onSelected="(row)=>onSelected(row, 'BrandSelect')"></BrandSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<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-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="申请时间" prop="createTime"> <el-form-item label="申请时间" prop="createTime">
...@@ -459,16 +458,16 @@ export default { ...@@ -459,16 +458,16 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
taskCode: [ taskCode: [
{ required: true, message: "任务单号称不能为空", trigger: "blur" } { required: true, message: "任务单号称不能为空", trigger: "change" }
], ],
arrangeCode: [ arrangeCode: [
{ required: true, message: "编排单号称不能为空", trigger: "blur" } { required: true, message: "编排单号称不能为空", trigger: "change" }
], ],
createTime: [ createTime: [
{ required: true, message: "申请时间不能为空", trigger: "blur" } { required: true, message: "申请时间不能为空", trigger: "change" }
], ],
workorderCode: [ workorderCode: [
{ required: true, message: "工单号称不能为空", trigger: "blur" } { required: true, message: "工单号称不能为空", trigger: "change" }
], ],
} }
...@@ -530,13 +529,18 @@ export default { ...@@ -530,13 +529,18 @@ export default {
this.form.taskName = row.taskName; this.form.taskName = row.taskName;
this.form.arrangeCode = row.arrangeCode; this.form.arrangeCode = row.arrangeCode;
this.form.startTime = row.scheduleStartDate; this.form.startTime = row.scheduleStartDate;
this.$set(this.form,'workstationCode',row.workstationCode) this.form.workstationCode = row.workstationCode;
this.$set(this.form,'workunitName',row.workunitName) this.form.workunitName = row.workunitName;
// this.$set(this.form,'workstationCode',row.workstationCode)
// this.$set(this.form,'workunitName',row.workunitName)
this.form.workunitCode=row.workunitCode; this.form.workunitCode=row.workunitCode;
this.form.workstationName=row.workstationName; this.form.workstationName=row.workstationName;
this.$set(this.form,'endTime',row.scheduleEndDate) this.form.endTime=row.scheduleEndDate;
// this.$set(this.form,'endTime',row.scheduleEndDate)
} else if (type === 'arangeSelect') { } else if (type === 'arangeSelect') {
this.form.arrangeCode = row.arrangeCode; this.form.arrangeCode = row.arrangeCode;
this.form.workorderCode = row.workorderCode;
this.form.workorderId = row.workorderId;
} }
} }
...@@ -544,12 +548,16 @@ export default { ...@@ -544,12 +548,16 @@ export default {
onWorkorderSelect(row){ onWorkorderSelect(row){
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.$set(this.form,'workorderCode',row.workorderCode) // this.$set(this.form,'workorderCode',row.workorderCode)
this.form.workorderId=row.workorderId; this.form.workorderId = row.workorderId;
this.form.taskCode = ''; this.form.workorderCode = row.workorderCode;
this.form.taskId = ''; if(row.arrangeCode) {
this.form.arrangeCode = ''; this.form.arrangeCode = row.arrangeCode;
this.form.taskName = ''; }
// this.form.taskCode = '';
// this.form.taskId = '';
// this.form.arrangeCode = '';
// this.form.taskName = '';
} }
}, },
......
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