fix:扫A、扫B、成品抛、一次、二次、三次超洗填日志中操作人可多选
This commit is contained in:
parent
b2413f1fd9
commit
a4f0900cbe
|
@ -59,7 +59,6 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
<el-col :md="12" :sm="24">
|
<el-col :md="12" :sm="24">
|
||||||
<el-form-item label="生产设备">
|
<el-form-item label="生产设备">
|
||||||
<el-select
|
<el-select
|
||||||
|
@ -81,7 +80,28 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :md="12" :sm="24">
|
<!-- 操作员多选 -->
|
||||||
|
<el-col :md="12" :sm="24" v-if="route_code=='saobian'||route_code=='saobianb'||route_code=='chengpinpao'">
|
||||||
|
<el-form-item label="操作员">
|
||||||
|
<el-select
|
||||||
|
v-model="form.handle_users"
|
||||||
|
placeholder="操作员"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
multiple
|
||||||
|
class="width100"
|
||||||
|
@change="handleUsersChange"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in userList"
|
||||||
|
:key="item.id"
|
||||||
|
:label="item.name"
|
||||||
|
:value="item.id"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :md="12" :sm="24" v-else>
|
||||||
<el-form-item label="操作员">
|
<el-form-item label="操作员">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.handle_user"
|
v-model="form.handle_user"
|
||||||
|
@ -99,25 +119,6 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- <el-col :md="12" :sm="24">
|
|
||||||
<el-form-item label="班次">
|
|
||||||
<el-select
|
|
||||||
v-model="form.shift"
|
|
||||||
placeholder="班次"
|
|
||||||
clearable
|
|
||||||
filterable
|
|
||||||
class="width100"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="item in shiftOtions"
|
|
||||||
:key="item.id"
|
|
||||||
:label="item.name"
|
|
||||||
:value="item.id"
|
|
||||||
>
|
|
||||||
</el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col> -->
|
|
||||||
<el-col :md="12" :sm="12" :xs="24" v-for="item in testitems" :key="item.id">
|
<el-col :md="12" :sm="12" :xs="24" v-for="item in testitems" :key="item.id">
|
||||||
<el-form-item :label="item.name">
|
<el-form-item :label="item.name">
|
||||||
<el-input-number
|
<el-input-number
|
||||||
|
@ -308,12 +309,10 @@
|
||||||
const defaultForm = {
|
const defaultForm = {
|
||||||
batch: null,
|
batch: null,
|
||||||
equipment: null,
|
equipment: null,
|
||||||
// mtaskb: null,
|
|
||||||
shift: null,
|
shift: null,
|
||||||
wm_in: null,
|
wm_in: null,
|
||||||
fmlog:null,
|
fmlog:null,
|
||||||
// work_start_time:null,
|
handle_users:null,
|
||||||
// work_end_time:null,
|
|
||||||
material_out:'',
|
material_out:'',
|
||||||
count_pn_jgqbl:0,
|
count_pn_jgqbl:0,
|
||||||
count_use:0,
|
count_use:0,
|
||||||
|
@ -379,6 +378,7 @@ export default {
|
||||||
qct:'',
|
qct:'',
|
||||||
codeText:'',
|
codeText:'',
|
||||||
codeBatch:'',
|
codeBatch:'',
|
||||||
|
route_code:'',
|
||||||
mgroupName:'',
|
mgroupName:'',
|
||||||
materialCount:1,//领料批次现有库存数
|
materialCount:1,//领料批次现有库存数
|
||||||
material_in:'',
|
material_in:'',
|
||||||
|
@ -403,12 +403,14 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.getShift();
|
let that = this;
|
||||||
this.getMgroup();
|
that.route_code = that.$route.path.split("/")[2];
|
||||||
this.getRoute();
|
that.getShift();
|
||||||
this.gettestitem();
|
that.getMgroup();
|
||||||
this.form.fmlog = this.fmlog;
|
that.getRoute();
|
||||||
this.form.handle_date = this.$TOOL.dateFormat2(new Date());;
|
that.gettestitem();
|
||||||
|
that.form.fmlog = that.fmlog;
|
||||||
|
that.form.handle_date = that.$TOOL.dateFormat2(new Date());;
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
getTeam() {
|
getTeam() {
|
||||||
|
@ -612,6 +614,9 @@ export default {
|
||||||
setData(data) {
|
setData(data) {
|
||||||
Object.assign(this.form, data);
|
Object.assign(this.form, data);
|
||||||
},
|
},
|
||||||
|
handleUsersChange(){
|
||||||
|
console.log('handleUsersChange',this.form.handle_users)
|
||||||
|
},
|
||||||
countUseChange(){
|
countUseChange(){
|
||||||
let that = this;
|
let that = this;
|
||||||
that.form.count_real = that.form.count_use - that.form.count_pn_jgqbl;
|
that.form.count_real = that.form.count_use - that.form.count_pn_jgqbl;
|
||||||
|
|
|
@ -131,7 +131,28 @@
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :md="12" :sm="24">
|
<el-col :md="12" :sm="24" v-if="route_code=='chaoxi'||route_code=='chaoxi2'||route_code=='chaoxi3'">
|
||||||
|
<el-form-item label="操作人">
|
||||||
|
<el-select
|
||||||
|
v-model="form.handle_users"
|
||||||
|
placeholder="操作人"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
multiple
|
||||||
|
:disabled="mode == 'edit'"
|
||||||
|
style="width: 100%"
|
||||||
|
@change="handleUsersChange"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in userOptions"
|
||||||
|
:key="item.id"
|
||||||
|
:label="item.name"
|
||||||
|
:value="item.id"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :md="12" :sm="24" v-else>
|
||||||
<el-form-item label="操作人">
|
<el-form-item label="操作人">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.handle_user"
|
v-model="form.handle_user"
|
||||||
|
@ -274,6 +295,7 @@ const defaultForm = {
|
||||||
route: "",
|
route: "",
|
||||||
equipment: "",
|
equipment: "",
|
||||||
handle_user: null,
|
handle_user: null,
|
||||||
|
handle_users:null,
|
||||||
work_start_time: "",
|
work_start_time: "",
|
||||||
work_end_time:null,
|
work_end_time:null,
|
||||||
note:'',
|
note:'',
|
||||||
|
@ -321,6 +343,7 @@ export default {
|
||||||
edit: "编辑日志",
|
edit: "编辑日志",
|
||||||
show: "查看日志",
|
show: "查看日志",
|
||||||
},
|
},
|
||||||
|
route_code:"",
|
||||||
test_file:'',
|
test_file:'',
|
||||||
fileList:[],
|
fileList:[],
|
||||||
testitems:[],
|
testitems:[],
|
||||||
|
@ -382,6 +405,8 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
let that = this;
|
||||||
|
that.route_code = that.$route.path.split("/")[2];
|
||||||
this.getUser();
|
this.getUser();
|
||||||
this.getRoute();
|
this.getRoute();
|
||||||
this.getTeam();
|
this.getTeam();
|
||||||
|
@ -503,6 +528,9 @@ export default {
|
||||||
console.log('res',res);
|
console.log('res',res);
|
||||||
this.test_file = res.path;
|
this.test_file = res.path;
|
||||||
},
|
},
|
||||||
|
handleUsersChange(){
|
||||||
|
console.log('handleUsersChange',this.form.handle_users)
|
||||||
|
},
|
||||||
//表单提交方法
|
//表单提交方法
|
||||||
submit() {
|
submit() {
|
||||||
let that = this;
|
let that = this;
|
||||||
|
|
Loading…
Reference in New Issue