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

Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

This commit is contained in:
caoqianming 2025-11-24 09:00:34 +08:00
parent bc9effd983 ade3cb8398
commit b56f1e9b32
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,24 +17,6 @@
style="padding: 0 10px"
>
<el-row>
<!-- <el-col :md="12" :sm="24">
<el-form-item label="生产类型" prop="mtype">
<el-select
v-model="form.mtype"
placeholder="生产类型"
clearable
:disabled="mode == 'edit'"
style="width: 100%"
>
<el-option
v-for="item in typeOptions"
: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-if="mgroupMtype == 20">
<el-form-item
label="外协单位"
@ -170,13 +152,6 @@
>
</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> -->
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
@ -419,7 +394,7 @@ export default {
this.getEquipment();
this.gettestitem();
let date = new Date();
this.form.work_start_time = this.form.work_end_time = this.$TOOL.dateFormat(date)
this.form.work_start_time = this.form.work_end_time = this.$TOOL.dateFormat(date);
},
methods: {
@ -548,6 +523,19 @@ export default {
that.form.route = null;
}
if (that.mode === "add") {
if(that.mgroupName=='黑化'){
let times = 0;
that.testitems.forEach(item=>{
if(item.name=='保温时间'||item.name=='冷却时间'){
times = times + item.value;
}
})
let time_diff = times*60*1000;
let start_times = new Date(that.form.work_start_time).getTime();
let end_time = start_times + time_diff;
let work_end_time = new Date(end_time);
that.form.work_end_time = that.$TOOL.dateFormat(work_end_time);
}
that.$API.wpm.mlog.init.req(that.form).then((res) => {
that.isSaveing = false;
that.$emit("success");