zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:日志添加班组

This commit is contained in:
shijing 2025-04-23 10:53:36 +08:00
parent 54d1464e74
commit 249af1897c
2 changed files with 125 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/views/wpm_gx/f_mlogs_form.vue
View File

@ -40,23 +40,25 @@
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="操作员">
<el-form-item label="班组">
<el-select
v-model="form.handle_user"
placeholder="操作员"
clearable
filterable
class="width100"
v-model="form.team"
placeholder="班组"
:disabled="mode == 'edit'"
style="width: 100%"
@change="teamChange"
>
<el-option
v-for="item in userList"
v-for="item in teamOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="生产设备">
<el-select
@ -79,6 +81,24 @@
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="操作员">
<el-select
v-model="form.handle_user"
placeholder="操作员"
clearable
filterable
class="width100"
>
<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">
<el-form-item label="班次">
<el-select
v-model="form.shift"
@ -96,7 +116,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :md="12" :sm="12" :xs="24" v-for="item in testitems" :key="item.id">
<el-form-item :label="item.name">
<el-input-number
@ -363,6 +383,7 @@ export default {
options: [],
testitems:[],
qct_defects:[],
teamOptions:[],
routeOptions: [],
supplierOptions: [],
materialOptions:[],
@ -378,6 +399,21 @@ export default {
this.form.handle_date = this.$TOOL.dateFormat2(new Date());;
},
methods: {
getTeam() {
let that = this;
let form = {};
form.page = 0;
form.belong_dept = this.deptId;
that.$API.mtm.team.list.req(form).then((res) => {
that.teamOptions = res;
});
},
teamChange(){
let that = this;
that.$API.mtm.teammember.list.req({team:that.form.team,page:0}).then((res) => {
that.userOptions = res;
});
},
//获取操作项
gettestitem(){
let that = this;
@ -404,6 +440,7 @@ export default {
that.$API.mtm.mgroup.item.req(that.mgroup).then((res) => {
that.deptId = res.belong_dept;
that.mgroupName = res.name;
this.getTeam();
that.getEquipment();
that.getUserList();
});

94
src/views/wpm_gx/mlog_form.vue
View File

@ -77,23 +77,19 @@
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="生产设备">
<el-form-item label="班组">
<el-select
v-model="form.equipment"
placeholder="生产设备"
clearable
filterable
v-model="form.team"
placeholder="班组"
:disabled="mode == 'edit'"
style="width: 100%"
>
<el-option
v-for="item in options"
v-for="item in teamOptions"
:key="item.id"
:label="item.label"
:label="item.name"
:value="item.id"
>
<span style="float:left">{{item.name}}</span>
<span style="float:right">{{item.number}}</span>
</el-option>
</el-select>
</el-form-item>
@ -137,13 +133,50 @@
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="操作人">
<ehsSelect
<el-select
v-model="form.handle_user"
placeholder="操作人"
:disabled="mode == 'edit'"
style="width: 100%"
filterable
>
<el-option
v-for="item in userOptions"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
<!-- <ehsSelect
v-model="form.handle_user"
:showName="form.handle_user_name"
:apiObj="this.$API.system.user.list"
:params="{ depts: dept }"
style="width: 100%;"
></ehsSelect>
></ehsSelect> -->
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="生产设备">
<el-select
v-model="form.equipment"
placeholder="生产设备"
clearable
filterable
:disabled="mode == 'edit'"
style="width: 100%"
>
<el-option
v-for="item in options"
:key="item.id"
:label="item.label"
:value="item.id"
>
<span style="float:left">{{item.name}}</span>
<span style="float:right">{{item.number}}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- 黑化 -->
@ -341,6 +374,7 @@ export default {
visible: false,
isSaveing: false,
options: [],
teamOptions:[],
routeOptions: [],
userOptions: [],
supplierOptions: [],
@ -348,8 +382,9 @@ export default {
};
},
mounted() {
this.getUser();
this.getRoute();
// this.getUser();
this.getTeam();
this.getSupplier();
this.getEquipment();
this.gettestitem();
@ -358,6 +393,21 @@ export default {
},
methods: {
getTeam() {
let that = this;
let form = {};
form.page = 0;
form.belong_dept = this.dept;
that.$API.mtm.team.list.req(form).then((res) => {
that.teamOptions = res;
});
},
teamChange(){
let that = this;
that.$API.mtm.teammember.list.req({team:that.form.team,page:0}).then((res) => {
that.userOptions = res;
});
},
//获取操作项
gettestitem(){
let that = this;
@ -373,10 +423,24 @@ export default {
disabledDateFn(time) {
return time.getTime() > new Date().getTime();
},
//获取
// //获取
getUser() {
this.$API.system.user.list.req({ depts: this.dept }).then((res) => {
this.userOptions = res.results;
let that = this;
let userInfo = that.$TOOL.data.get("USER_INFO");
this.$API.system.user.list.req({ depts: that.dept, page: 0 }).then((res) => {
that.userOptions = res;
let arr = res.filter(item=>{
return item.id==userInfo.id;
})
if(arr.length>0){
that.form.handle_user = userInfo.id;
}else{
let obj = {};
obj.id = userInfo.id;
obj.name = userInfo.name;
that.userOptions.push(obj)
that.form.handle_user = userInfo.id;
}
});
},
getEquipment() {