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

Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2

This commit is contained in:
shijing 2024-01-22 08:50:53 +08:00
parent 348bd899d5 1d896185a2
commit 940c1b6337
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -430,7 +430,7 @@
<el-col :md="12" :sm="24" v-if="material_name.indexOf('管')>-1">
<el-form-item label="弯">
<el-input-number
v-model="form.count_n_w"
v-model="form.count_n_wq"
controls-position="right"
:min="0"
:step="1"
@ -517,7 +517,7 @@ export default {
count_n_tydd:0,//椭圆度大
count_n_sw:0,//水雾
count_n_bhpcd:0,//壁厚偏差大
count_n_w:0,//弯
count_n_wq:0,//弯
handle_user:''
},
@ -634,7 +634,8 @@ export default {
Number(this.form.count_n_tydd)+
Number(this.form.count_n_sw)+
Number(this.form.count_n_bhpcd)+
Number(this.form.count_n_w)
Number(this.form.count_n_wq)+
Number(this.form.count_n_zw)
;
},
//提交

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

@ -67,7 +67,7 @@
<el-table-column prop="count_n_tydd" label="椭圆度大" />
<el-table-column prop="count_n_sw" label="水雾" />
<el-table-column prop="count_n_bhpcd" label="壁厚偏差大" />
<el-table-column prop="count_n_w" label="弯" />
<el-table-column prop="count_n_wq" label="弯" />
</template>
</el-table-column>
<el-table-column label="操作人" prop="update_by_name"></el-table-column>

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

@ -14,7 +14,7 @@
</el-table-column>
<el-table-column label="产物" prop="material" show-overflow-tooltip>
<template #default="scope"><span v-if="scope.row.material_out_">{{
scope.row.material_out_.name
scope.row.material_out_.full_name
}}</span>
</template>
</el-table-column>
@ -65,7 +65,7 @@
</el-table-column>
<el-table-column label="产物" prop="material" show-overflow-tooltip>
<template #default="scope"><span v-if="scope.row.material_">{{
scope.row.material_.name
scope.row.material_.full_name
}}</span>
</template>
</el-table-column>

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

@ -13,7 +13,7 @@
<el-table-column label="物料名" prop="material_out_name">
<template #default="scope">
<span v-if="scope.row.material_out_">
{{ scope.row.material_out_.name }}
{{ scope.row.material_out_.full_name }}
</span>
</template>
</el-table-column>
@ -67,7 +67,7 @@
<el-table-column label="产物" prop="material" show-overflow-tooltip>
<template #default="scope">
<span v-if="scope.row.material_out_">
{{ scope.row.material_out_.name }}
{{ scope.row.material_out_.full_name }}
</span>
</template>
</el-table-column>

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

@ -38,6 +38,7 @@
<el-form-item label="生产路线" v-if="mode == 'add'">
<el-select
v-model="currentRoute"
value-key="id"
placeholder="生产路线"
clearable
filterable
@ -48,7 +49,7 @@
v-for="item in routeOptions"
:key="item.id"
:label="item.label"
:value="item.id"
:value="item"
></el-option>
</el-select>
</el-form-item>
@ -174,8 +175,10 @@
<el-form-item label="生产路线" v-if="mode == 'add'">
<el-select
v-model="currentRoute"
value-key="id"
placeholder="生产路线"
filterable
clearable
style="width: 100%"
@change="routeChange"
>