fix:日志显示问题以及工艺路线改为工艺步骤
This commit is contained in:
parent
7bdd81c42b
commit
797d8d5981
|
|
@ -2,7 +2,7 @@
|
|||
<el-dialog
|
||||
:title="titleMap[mode]"
|
||||
v-model="visible"
|
||||
:size="1000"
|
||||
style="width: 80%;"
|
||||
destroy-on-close
|
||||
@closed="$emit('closed')"
|
||||
>
|
||||
|
|
@ -37,10 +37,10 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="工艺路线">
|
||||
<el-form-item label="工艺步骤">
|
||||
<el-select
|
||||
v-model="form.route"
|
||||
placeholder="工艺路线"
|
||||
placeholder="工艺步骤"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 100%"
|
||||
|
|
@ -48,10 +48,9 @@
|
|||
<el-option
|
||||
v-for="item in routeOptions"
|
||||
:key="item.id"
|
||||
:label="item.routepack_name"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
>
|
||||
<span>{{ item.routepack_name }}-{{item.process_name}}</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
|
@ -166,6 +165,9 @@ export default {
|
|||
.req({ process: that.process, page: 0, routepack__state: 30 })
|
||||
.then((res) => {
|
||||
that.routeOptions = res;
|
||||
if(res.length==1){
|
||||
that.form.route = res[0].id;
|
||||
}
|
||||
});
|
||||
},
|
||||
//显示
|
||||
|
|
|
|||
|
|
@ -332,7 +332,7 @@
|
|||
:mgroup="mgroup"
|
||||
:is_fix = "is_fix"
|
||||
:mgroupMtype="mgroupMtype"
|
||||
:mgroupName = "mlogItem.mgroup_name"
|
||||
:mgroupName = "mgroupName"
|
||||
:codeText = "codeText"
|
||||
:materialIn="materialIn"
|
||||
@success="handleSaveSuccess"
|
||||
|
|
@ -342,6 +342,7 @@
|
|||
<check-dialog
|
||||
v-if="dialog.check"
|
||||
ref="checkDialog"
|
||||
:deptId="deptId"
|
||||
:mgroupMtype="mgroupMtype"
|
||||
@success="handleCheckSuccess"
|
||||
@closed="dialog.check = false"
|
||||
|
|
@ -351,7 +352,10 @@
|
|||
v-if="dialog.edit"
|
||||
ref="editDialog"
|
||||
:dept="deptId"
|
||||
:mgroupName= "mlogItem.mgroup_name"
|
||||
:mgroup="mgroup"
|
||||
:process="process"
|
||||
:mgroupMtype="mgroupMtype"
|
||||
:mgroupName= "mgroupName"
|
||||
@success="handleEditSuccess"
|
||||
@closed="dialog.edit = false"
|
||||
>
|
||||
|
|
@ -468,6 +472,10 @@ export default {
|
|||
mgroupMtype:{
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
process:{
|
||||
type: String,
|
||||
default: "",
|
||||
}
|
||||
},
|
||||
components: {
|
||||
|
|
@ -534,6 +542,7 @@ export default {
|
|||
cellsList:[],
|
||||
qct_defects:[],
|
||||
tableDataWm:[],
|
||||
mgroupName:'',
|
||||
test_file:'',
|
||||
deptId: "",
|
||||
codeText: "",
|
||||
|
|
@ -582,6 +591,7 @@ export default {
|
|||
let that = this;
|
||||
that.$API.wpm.mlog.item.req(that.mlogId).then((res) => {
|
||||
that.mlogItem = res;
|
||||
that.mgroupName = res.mgroup_name;
|
||||
if(res.test_file!==null){
|
||||
that.fileList = [{name:res.test_file,url:res.test_file}];
|
||||
that.form.test_file = res.test_file;
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
<el-dialog
|
||||
:title="titleMap[mode]"
|
||||
v-model="visible"
|
||||
:size="1000"
|
||||
destroy-on-close
|
||||
style="width: 80%;"
|
||||
@closed="$emit('closed')"
|
||||
>
|
||||
<el-container v-loading="loading">
|
||||
|
|
@ -57,10 +57,10 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24" v-if="mlogtype!=='rework'">
|
||||
<el-form-item label="工艺路线" prop="route">
|
||||
<el-form-item label="工艺步骤" prop="route">
|
||||
<el-select
|
||||
v-model="form.route"
|
||||
placeholder="工艺路线"
|
||||
placeholder="工艺步骤"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 100%"
|
||||
|
|
@ -69,14 +69,9 @@
|
|||
<el-option
|
||||
v-for="item in routeOptions"
|
||||
:key="item.id"
|
||||
:label="item.routepack_name"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
>
|
||||
<span
|
||||
>{{ item.routepack_name }}-{{
|
||||
item.process_name
|
||||
}}</span
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
|
@ -129,12 +124,12 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-col :md="12" :sm="24" v-if="mode == 'edit'">
|
||||
<el-form-item label="结束时间" prop="work_end_time">
|
||||
<!-- :disabledDate="disabledDateFn" -->
|
||||
<el-date-picker
|
||||
v-model="form.work_end_time"
|
||||
type="datetime"
|
||||
:disabledDate="disabledDateFn"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
style="width: 100%"
|
||||
/>
|
||||
|
|
@ -406,6 +401,9 @@ export default {
|
|||
.req({ process: that.process, page: 0, routepack__state: 30 })
|
||||
.then((res) => {
|
||||
that.routeOptions = res;
|
||||
if(res.length==1){
|
||||
that.form.route = res[0].id;
|
||||
}
|
||||
});
|
||||
},
|
||||
//显示
|
||||
|
|
|
|||
|
|
@ -343,6 +343,7 @@ export default {
|
|||
let that = this;
|
||||
that.materialOptions.forEach(item => {
|
||||
if(item.id==that.form.wm_in){
|
||||
that.form.batch = item.batch;
|
||||
that.form.count_use = item.count;
|
||||
that.batch_count = item.count;
|
||||
}
|
||||
|
|
@ -414,11 +415,13 @@ export default {
|
|||
}
|
||||
let count_pn_jgqbl = 0,mlogbindefect=[];
|
||||
that.qct_defects.forEach(item => {
|
||||
count_pn_jgqbl += that.defectinform[item.defect_name] ;
|
||||
let obj = {};
|
||||
obj.defect = item.defect;
|
||||
obj.count = that.defectinform[item.defect_name];
|
||||
mlogbindefect.push(obj);
|
||||
if(that.defectinform[item.defect_name]>0){
|
||||
count_pn_jgqbl += that.defectinform[item.defect_name] ;
|
||||
let obj = {};
|
||||
obj.defect = item.defect;
|
||||
obj.count = that.defectinform[item.defect_name];
|
||||
mlogbindefect.push(obj);
|
||||
}
|
||||
})
|
||||
that.form.mlogbindefect = mlogbindefect;
|
||||
that.form.count_pn_jgqbl = count_pn_jgqbl;
|
||||
|
|
|
|||
|
|
@ -182,6 +182,7 @@
|
|||
ref="detailDialog"
|
||||
:mlogId="mlogId"
|
||||
:mtask="mtask"
|
||||
:process="processId"
|
||||
:mgroupMtype="mgroupMtype"
|
||||
@closed="detailClose"
|
||||
>
|
||||
|
|
|
|||
Loading…
Reference in New Issue