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

fix: 班次选择，先这样处理

This commit is contained in:
caoqianming 2023-12-22 10:38:09 +08:00
parent b207edccf5
commit a1b74f4639
5 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/wpm/mlog6_form.vue
View File

@ -58,7 +58,7 @@
<el-option <el-option
v-for="item in equipmentOptions" v-for="item in equipmentOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.full_name"
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>

12
src/views/wpm/mlog_dept7.vue
View File

@ -255,9 +255,15 @@
</el-main> </el-main>
</el-container> </el-container>
</el-main> </el-main>
<save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup" <save-dialog v-if="dialogSave" ref="saveDialog"
:material_out="material_out" :material_in="material_in" :activeType="activeName" @success="handleSaveSuccess" :mtask="currentMtask.id"
@closed="dialogSave = false"></save-dialog> :mgroup="mgroup"
:material_out="material_out"
:material_in="material_in"
:activeType="activeName"
@success="handleSaveSuccess"
@closed="dialogSave = false">
</save-dialog>
<showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false"> <showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false">
</showDrawer> </showDrawer>
</el-container> </el-container>

1
src/views/wpm/mlog_hun.vue
View File

@ -155,6 +155,7 @@
<save-dialog v-if="dialogSave" <save-dialog v-if="dialogSave"
ref="saveDialog" ref="saveDialog"
:mgroup="currentMgroup.id" :mgroup="currentMgroup.id"
:mgroupShiftRule = "currentMgroup.shift_rule"
:activeType="activeName" :activeType="activeName"
@success="handleSaveSuccess" @success="handleSaveSuccess"
@closed="dialogSave = false"> @closed="dialogSave = false">

1
src/views/wpm/mlog_tui.vue
View File

@ -202,6 +202,7 @@
<save-dialog v-if="dialogSave" <save-dialog v-if="dialogSave"
ref="saveDialog" ref="saveDialog"
:mgroup="currentMgroup.id" :mgroup="currentMgroup.id"
:mgroupShiftRule = "currentMgroup.shift_rule"
:activeType="activeName" :activeType="activeName"
@success="handleSaveSuccess" @success="handleSaveSuccess"
@closed="dialogSave = false"> @closed="dialogSave = false">

26
src/views/wpm/worktask_form.vue
View File

@ -503,7 +503,7 @@
<el-option <el-option
v-for="item in equipmentOptions" v-for="item in equipmentOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.full_name"
:value="item.id" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
@ -579,7 +579,7 @@
<el-option <el-option
v-for="item in equipmentOptions" v-for="item in equipmentOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.full_name"
:value="item.id" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
@ -1048,6 +1048,7 @@
export default { export default {
emits: ["success", "closed"], emits: ["success", "closed"],
props: { props: {
mgroupShiftRule:{ type: String, default: "" },
mgroup:{ type: String, default: "" }, mgroup:{ type: String, default: "" },
mtask: { type: String, default: "" }, mtask: { type: String, default: "" },
mgroupId: { type: String, default: "" }, mgroupId: { type: String, default: "" },
@ -1166,20 +1167,15 @@ export default {
}) })
}, },
getShiftOptions() { getShiftOptions() {
this.$API.mtm.shift.list.req({ page: 0}).then((res) => { let req_dict = {page: 0}
this.shiftOptions = []; if(this.mgroupShiftRule != null && this.mgroupShiftRule != undefined){
if(this.activeType == "10车间"){ req_dict.rule = this.mgroupShiftRule
res.forEach(item=>{ }
if(item.rule=='两倒'){ this.$API.mtm.shift.list.req(req_dict).then((res) => {
this.shiftOptions.push(item); if(res.length==1){
} this.form.shift = res[0].id
})
}else{ }else{
res.forEach(item=>{ this.shiftOptions = res
if(item.rule=='长白班'){
this.form.shift = item.id;
}
})
} }
}); });
}, },