Compare commits
No commits in common. "ade3cb83987ae9fdab3a1cd49efee313497629c2" and "2b639300125164cbd94b993bca8151d3d4f1f0f5" have entirely different histories.
ade3cb8398
...
2b63930012
|
|
@ -17,6 +17,24 @@
|
||||||
style="padding: 0 10px"
|
style="padding: 0 10px"
|
||||||
>
|
>
|
||||||
<el-row>
|
<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-col :md="12" :sm="24" v-if="mgroupMtype == 20">
|
||||||
<el-form-item
|
<el-form-item
|
||||||
label="外协单位"
|
label="外协单位"
|
||||||
|
|
@ -152,6 +170,13 @@
|
||||||
>
|
>
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</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-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :md="12" :sm="24">
|
<el-col :md="12" :sm="24">
|
||||||
|
|
@ -394,7 +419,7 @@ export default {
|
||||||
this.getEquipment();
|
this.getEquipment();
|
||||||
this.gettestitem();
|
this.gettestitem();
|
||||||
let date = new Date();
|
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: {
|
methods: {
|
||||||
|
|
@ -523,19 +548,6 @@ export default {
|
||||||
that.form.route = null;
|
that.form.route = null;
|
||||||
}
|
}
|
||||||
if (that.mode === "add") {
|
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.$API.wpm.mlog.init.req(that.form).then((res) => {
|
||||||
that.isSaveing = false;
|
that.isSaveing = false;
|
||||||
that.$emit("success");
|
that.$emit("success");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue