batch跟随mtask日期

This commit is contained in:
shijing 2024-01-24 09:02:29 +08:00
parent 0a273bbfca
commit 5ed9cd6d72
2 changed files with 23 additions and 11 deletions

View File

@ -258,9 +258,10 @@
</el-main>
</el-container>
</el-main>
<save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup"
:material_out="material_out" :material_model="material_model" :brothersList="brothersList" :material_in="material_in" :activeType="activeName"
@success="handleSaveSuccess" @closed="dialogSave = false"></save-dialog>
<save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup" :mtaskDate="mtaskDate"
:material_out="material_out" :material_model="material_model" :brothersList="brothersList"
: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>
<el-dialog title="编辑任务" v-model="addMtaskInfoVisible">
@ -313,8 +314,9 @@ export default {
paramsWm: {},
mgroup: '',
mlogId: '',
mtaskDate: '',
material_out: '',
material_model:'',
material_model: '',
}
},
mounted() {
@ -400,6 +402,7 @@ export default {
let that = this;
if (that.currentMtask && that.currentMtask.id) {
that.mgroup = that.currentMtask.mgroup;
that.mtaskDate = that.currentMtask.start_date;
that.material_out = that.currentMtask.material_out;
that.material_model = that.currentMtask.material_out_.model;
let arr = [];
@ -420,10 +423,10 @@ export default {
}
},
table_submit(row) {
let lengths = row.mlogs.length,infoText = '';
if(lengths>0){
infoText = '该任务有'+lengths+'条日志,确定提交吗?';
}else{
let lengths = row.mlogs.length, infoText = '';
if (lengths > 0) {
infoText = '该任务有' + lengths + '条日志,确定提交吗?';
} else {
infoText = '该任务没有日志,确定提交吗?';
}
this.$confirm(infoText, "提示", {
@ -433,7 +436,7 @@ export default {
this.$message.success('操作成功')
this.$refs.table_mtask.refresh()
this.mtaskClick(this.currentMtask)
}).catch(err => {})
}).catch(err => { })
})
},
// table_submit(row) {

View File

@ -577,6 +577,7 @@ export default {
material_out: { type: String, default: "" },
material_model: { type: String, default: "" },
brothersList: { type: Array, default: () => [] },
mtaskDate: { type: String, default: "" }
},
data() {
return {
@ -645,7 +646,15 @@ export default {
this.form.mtask = this.mtask;
this.form.mgroup = this.mgroup;
this.form.handle_date = handle_date;
this.form.batch = this.material_model + '-' + dateNow;
let batchDate = '';
console.log(this.mtaskDate);
if (this.mtaskDate !== '') {
batchDate = this.mtaskDate.split('-').join('');
console.log(batchDate);
} else {
batchDate = dateNow;
}
this.form.batch = this.material_model + '-' + batchDate;
this.getMaterial();
this.getUserList();
this.getEquipment();
@ -787,7 +796,7 @@ export default {
let obj = {};
obj.page = 0;
obj.is_hidden = false;
obj.type__in = '10,20,30';
this.$API.mtm.material.list.req(obj).then((res) => {
this.materialOptions = res;
});