diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue index 3ee22b4f..5f562f71 100644 --- a/src/views/wpm_gx/f_mlogs_form.vue +++ b/src/views/wpm_gx/f_mlogs_form.vue @@ -312,6 +312,7 @@ const defaultForm = { shift: null, wm_in: null, fmlog:null, + handle_user:null, handle_users:null, material_out:'', count_pn_jgqbl:0, @@ -615,6 +616,7 @@ export default { Object.assign(this.form, data); }, handleUsersChange(){ + this.form.handle_user = this.form.handle_users.length>0?this.form.handle_users[0]:null; console.log('handleUsersChange',this.form.handle_users) }, countUseChange(){ diff --git a/src/views/wpm_gx/fmlog_detail.vue b/src/views/wpm_gx/fmlog_detail.vue index 3825bd0a..bbcf81d5 100644 --- a/src/views/wpm_gx/fmlog_detail.vue +++ b/src/views/wpm_gx/fmlog_detail.vue @@ -52,7 +52,14 @@ > - + + + @@ -212,6 +219,7 @@ export default { batchContains:[], test_file:'', deptId: "", + route_code: "", is_fix:false, visible: false, isSaveing: false, @@ -232,6 +240,8 @@ export default { }; }, mounted() { + let that = this; + that.route_code = that.$route.path.split("/")[2]; this.getfmlogItem(); this.params.fmlog = this.fmlogId; this.paramsWm.mgroup = this.mgroup; diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue index 8dcd0061..673f4fe2 100644 --- a/src/views/wpm_gx/mlog_detail.vue +++ b/src/views/wpm_gx/mlog_detail.vue @@ -31,9 +31,12 @@ {{ mlogItem.belong_dept_name }} - {{ - mlogItem.handle_user_name - }} + +
+ {{ item.name }} +
+ {{mlogItem.handle_user_name}} +
{{ mlogItem.create_time }} diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue index 85d2c4d1..2ec3c8bc 100644 --- a/src/views/wpm_gx/mlog_form.vue +++ b/src/views/wpm_gx/mlog_form.vue @@ -529,6 +529,7 @@ export default { this.test_file = res.path; }, handleUsersChange(){ + this.form.handle_user = this.form.handle_users.length>0?this.form.handle_users[0]:null; console.log('handleUsersChange',this.form.handle_users) }, //表单提交方法 diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue index 023943e2..1b28b688 100644 --- a/src/views/wpm_gx/mlogs.vue +++ b/src/views/wpm_gx/mlogs.vue @@ -93,11 +93,15 @@ {{scope.row.belong_dept_name}}/{{scope.row.mgroup_name}} - + + + +