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-09-17 11:02:01 +08:00
parent 575a120e56 24104ca69c
commit 2f1910fed6
13 changed files with 237 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/em/mpoint_form.vue
View File

@ -261,21 +261,16 @@
<el-divider/> <el-divider/>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="所属设备"> <el-form-item label="所属设备">
<el-select <xtSelect
:apiObj="apiObjEq"
v-model="form.ep_belong" v-model="form.ep_belong"
placeholder="所属设备"
clearable
filterable
style="width: 100%" style="width: 100%"
@clear="() => { form.ep_belong=null } " :label="form.ep_belong_name"
placeholder="所属设备"
> >
<el-option <el-table-column label="名称" prop="name"></el-table-column>
v-for="item in epOptions" <el-table-column label="位号" prop="number"></el-table-column>
:key="item.id" </xtSelect>
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
@ -465,6 +460,7 @@ export default {
mpointOptions: [], mpointOptions: [],
epOptions: [], epOptions: [],
materials: [], materials: [],
apiObjEq:this.$API.em.equipment.list,
}; };
}, },
mounted() { mounted() {

4
src/views/inm/mioitem_form.vue
View File

@ -38,6 +38,7 @@
<el-input <el-input
v-if="form.type == 'pur_in'||form.type == 'other_in'" v-if="form.type == 'pur_in'||form.type == 'other_in'"
v-model="form.batch" v-model="form.batch"
clearable
placeholder="手动输入批次号" placeholder="手动输入批次号"
:disabled="inputBatchDisable" :disabled="inputBatchDisable"
/> />
@ -500,6 +501,9 @@ export default {
} else { } else {
this.getBatchOptions(); this.getBatchOptions();
} }
if(that.project_code=='gx'&&that.type == 'pur_in'){
that.form.batch = '无'
}
}, },
getItem(options, id) { getItem(options, id) {
for (var i = 0; i < options.length; i++) { for (var i = 0; i < options.length; i++) {

163
src/views/statistics/bxerp/niuzhuanTotal.vue
View File

@ -37,31 +37,41 @@
</el-table-column> </el-table-column>
<el-table-column label="扭转数" fixed="left"> <el-table-column label="扭转数" fixed="left">
<template #default="scope"> <template #default="scope">
{{ scope.row.data.扭转检测_count_use }} {{ scope.row.data.扭后检测_count_use }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="扭后内质" align="center" class-name="colorheader1"> <el-table-column label="扭后内质" align="center" class-name="colorheader1">
<el-table-column label="合格" class-name="colorheader1"> <el-table-column label="合格" class-name="colorheader1">
<el-table-column label="数量" class-name="colorheader1"> <el-table-column label="数量" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠2mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠2mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span v-if="scope.row.data.扭后检测_含缺陷_暗点不合格&&scope.row.data.扭后检测_含缺陷_暗点重">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_暗点不合格 - scope.row.data.扭后检测_含缺陷_暗点重 }}</span>
<span v-else>
<span v-if="scope.row.data.扭后检测_含缺陷_暗点重">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_暗点重 }}</span>
<span v-else-if="scope.row.data.扭后检测_含缺陷_暗点不合格">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_暗点不合格 }}</span>
<span v-else>{{ scope.row.data.扭后检测_count_use }}</span>
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader1"> <el-table-column label="比例" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠2mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠2mm不合格_比例']:100 }}%</span> <span v-if="scope.row.data.扭后检测_含缺陷_暗点不合格&&scope.row.data.扭后检测_含缺陷_暗点重">{{100- scope.row.data.扭后检测_含缺陷_暗点不合格_比例 - scope.row.data.扭后检测_含缺陷_暗点重_比例 }}%</span>
<span v-else>
<span v-if="scope.row.data.扭后检测_含缺陷_暗点重">{{ 100 - scope.row.data.扭后检测_含缺陷_暗点重_比例 }}%</span>
<span v-else-if="scope.row.data.扭后检测_含缺陷_暗点不合格">{{100- scope.row.data.扭后检测_含缺陷_暗点不合格_比例 }}%</span>
<span v-else>100%</span>
</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="可加工" class-name="colorheader1"> <el-table-column label="可加工" class-name="colorheader1">
<el-table-column label="数量" class-name="colorheader1"> <el-table-column label="数量" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠2mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠2mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span>{{ scope.row.data.扭后检测_含缺陷_暗点不合格?scope.row.data.扭后检测_含缺陷_暗点不合格:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader1"> <el-table-column label="比例" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠2mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠2mm不合格_比例']:100 }}%</span> <span>{{ scope.row.data.扭后检测_含缺陷_暗点不合格?scope.row.data.扭后检测_含缺陷_暗点不合格_比例:0 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -70,36 +80,46 @@
<el-table-column label="无" class-name="colorheader2"> <el-table-column label="无" class-name="colorheader2">
<el-table-column label="数量" class-name="colorheader2"> <el-table-column label="数量" class-name="colorheader2">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span v-if="scope.row.data.扭后检测_含缺陷_黑网轻&&scope.row.data.扭后检测_含缺陷_黑网重">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_黑网轻 - scope.row.data.扭后检测_含缺陷_黑网重 }}</span>
<span v-else>
<span v-if="scope.row.data.扭后检测_含缺陷_黑网轻">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_黑网轻 }}</span>
<span v-else-if="scope.row.data.扭后检测_含缺陷_黑网重">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_黑网重 }}</span>
<span v-else>{{ scope.row.data.扭后检测_count_use }}</span>
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader2"> <el-table-column label="比例" class-name="colorheader2">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span> <span v-if="scope.row.data.扭后检测_含缺陷_黑网轻&&scope.row.data.扭后检测_含缺陷_黑网重">{{100- scope.row.data.扭后检测_含缺陷_黑网重_比例 - scope.row.data.扭后检测_含缺陷_黑网轻_比例 }}%</span>
<span v-else>
<span v-if="scope.row.data.扭后检测_含缺陷_黑网轻">{{ 100 - scope.row.data.扭后检测_含缺陷_黑网轻_比例 }}%</span>
<span v-else-if="scope.row.data.扭后检测_含缺陷_黑网重">{{100- scope.row.data.扭后检测_含缺陷_黑网重_比例 }}%</span>
<span v-else>100%</span>
</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="轻" class-name="colorheader2"> <el-table-column label="轻" class-name="colorheader2">
<el-table-column label="数量" class-name="colorheader2"> <el-table-column label="数量" class-name="colorheader2">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span>{{ scope.row.data.扭后检测_含缺陷_黑网轻?scope.row.data.扭后检测_含缺陷_黑网轻:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader2"> <el-table-column label="比例" class-name="colorheader2">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span> <span>{{ scope.row.data.扭后检测_含缺陷_黑网轻_比例?scope.row.data.扭后检测_含缺陷_黑网轻_比例:0 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="重" class-name="colorheader2"> <el-table-column label="重" class-name="colorheader2">
<el-table-column label="数量" class-name="colorheader2"> <el-table-column label="数量" class-name="colorheader2">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span>{{ scope.row.data.扭后检测_含缺陷_黑网重?scope.row.data.扭后检测_含缺陷_黑网重:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader2"> <el-table-column label="比例" class-name="colorheader2">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span> <span>{{ scope.row.data.扭后检测_含缺陷_黑网重_比例?scope.row.data.扭后检测_含缺陷_黑网重_比例:0 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -108,36 +128,46 @@
<el-table-column label="无" class-name="colorheader3"> <el-table-column label="无" class-name="colorheader3">
<el-table-column label="数量" class-name="colorheader3"> <el-table-column label="数量" class-name="colorheader3">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span v-if="scope.row.data.扭后检测_含缺陷_白网轻&&scope.row.data.扭后检测_含缺陷_白网重">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_白网轻 - scope.row.data.扭后检测_含缺陷_白网重 }}</span>
<span v-else>
<span v-if="scope.row.data.扭后检测_含缺陷_白网轻">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_白网轻 }}</span>
<span v-else-if="scope.row.data.扭后检测_含缺陷_白网重">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_白网重 }}</span>
<span v-else>{{ scope.row.data.扭后检测_count_use }}</span>
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader3"> <el-table-column label="比例" class-name="colorheader3">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span> <span v-if="scope.row.data.扭后检测_含缺陷_白网轻&&scope.row.data.扭后检测_含缺陷_白网重">{{100- scope.row.data.扭后检测_含缺陷_白网重_比例 - scope.row.data.扭后检测_含缺陷_白网轻_比例 }}%</span>
<span v-else>
<span v-if="scope.row.data.扭后检测_含缺陷_白网轻">{{ 100 - scope.row.data.扭后检测_含缺陷_白网轻_比例 }}%</span>
<span v-else-if="scope.row.data.扭后检测_含缺陷_白网重">{{100- scope.row.data.扭后检测_含缺陷_白网重_比例 }}%</span>
<span v-else>100%</span>
</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="轻" class-name="colorheader3"> <el-table-column label="轻" class-name="colorheader3">
<el-table-column label="数量" class-name="colorheader3"> <el-table-column label="数量" class-name="colorheader3">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span>{{ scope.row.data.扭后检测_含缺陷_白网轻?scope.row.data.扭后检测_含缺陷_白网轻:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader3"> <el-table-column label="比例" class-name="colorheader3">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span> <span>{{ scope.row.data.扭后检测_含缺陷_白网轻_比例?scope.row.data.扭后检测_含缺陷_白网轻_比例:0 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="重" class-name="colorheader3"> <el-table-column label="重" class-name="colorheader3">
<el-table-column label="数量" class-name="colorheader3"> <el-table-column label="数量" class-name="colorheader3">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span>{{ scope.row.data.扭后检测_含缺陷_白网重?scope.row.data.扭后检测_含缺陷_白网重:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader3"> <el-table-column label="比例" class-name="colorheader3">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span> <span>{{ scope.row.data.扭后检测_含缺陷_白网重_比例?scope.row.data.扭后检测_含缺陷_白网重_比例:0 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -146,36 +176,46 @@
<el-table-column label="无" class-name="colorheader4"> <el-table-column label="无" class-name="colorheader4">
<el-table-column label="数量" class-name="colorheader4"> <el-table-column label="数量" class-name="colorheader4">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span v-if="scope.row.data.扭后检测_含缺陷_小网轻&&scope.row.data.扭后检测_含缺陷_小网重">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_小网轻 - scope.row.data.扭后检测_含缺陷_小网重 }}</span>
<span v-else>
<span v-if="scope.row.data.扭后检测_含缺陷_小网轻">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_小网轻 }}</span>
<span v-else-if="scope.row.data.扭后检测_含缺陷_小网重">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_小网重 }}</span>
<span v-else>{{ scope.row.data.扭后检测_count_use }}</span>
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader4"> <el-table-column label="比例" class-name="colorheader4">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span> <span v-if="scope.row.data.扭后检测_含缺陷_小网轻&&scope.row.data.扭后检测_含缺陷_小网重">{{100- scope.row.data.扭后检测_含缺陷_小网重_比例 - scope.row.data.扭后检测_含缺陷_小网轻_比例 }}%</span>
<span v-else>
<span v-if="scope.row.data.扭后检测_含缺陷_小网轻">{{ 100 - scope.row.data.扭后检测_含缺陷_小网轻_比例 }}%</span>
<span v-else-if="scope.row.data.扭后检测_含缺陷_小网重">{{100- scope.row.data.扭后检测_含缺陷_小网重_比例 }}%</span>
<span v-else>100%</span>
</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="轻" class-name="colorheader4"> <el-table-column label="轻" class-name="colorheader4">
<el-table-column label="数量" class-name="colorheader4"> <el-table-column label="数量" class-name="colorheader4">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span>{{ scope.row.data.扭后检测_含缺陷_小网轻?scope.row.data.扭后检测_含缺陷_小网轻:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader4"> <el-table-column label="比例" class-name="colorheader4">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span> <span>{{ scope.row.data.扭后检测_含缺陷_小网轻_比例?scope.row.data.扭后检测_含缺陷_小网轻_比例:0 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="重" class-name="colorheader4"> <el-table-column label="重" class-name="colorheader4">
<el-table-column label="数量" class-name="colorheader4"> <el-table-column label="数量" class-name="colorheader4">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span>{{ scope.row.data.扭后检测_含缺陷_小网重?scope.row.data.扭后检测_含缺陷_小网重:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader4"> <el-table-column label="比例" class-name="colorheader4">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span> <span>{{ scope.row.data.扭后检测_含缺陷_小网重_比例?scope.row.data.扭后检测_含缺陷_小网重_比例:0 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -183,42 +223,42 @@
<el-table-column label="分辨率" align="center" class-name="colorheader5"> <el-table-column label="分辨率" align="center" class-name="colorheader5">
<el-table-column label="测试数量" class-name="colorheader5"> <el-table-column label="测试数量" class-name="colorheader5">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.扭转检测_count_ok }} </span> <span>{{ scope.row.data.扭后检测_count_use }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="国内" class-name="colorheader5"> <el-table-column label="国内" class-name="colorheader5">
<el-table-column label="数量" class-name="colorheader5"> <el-table-column label="数量" class-name="colorheader5">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span>{{ scope.row.data.扭后检测_含缺陷_分辨率?scope.row.data.扭后检测_含缺陷_分辨率:0}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader5"> <el-table-column label="比例" class-name="colorheader5">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span> <span>{{ scope.row.data.扭后检测_含缺陷_分辨率?scope.row.data.扭后检测_含缺陷_分辨率_比例:0}}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="出口" class-name="colorheader5"> <el-table-column label="出口" class-name="colorheader5">
<el-table-column label="数量" class-name="colorheader5"> <el-table-column label="数量" class-name="colorheader5">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span>{{ scope.row.data.扭后检测_含缺陷_分辨率?scope.row.data.扭后检测_含缺陷_分辨率:0}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader5"> <el-table-column label="比例" class-name="colorheader5">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span> <span>{{ scope.row.data.扭后检测_含缺陷_分辨率?scope.row.data.扭后检测_含缺陷_分辨率_比例:0}}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="不合格" class-name="colorheader5"> <el-table-column label="不合格" class-name="colorheader5">
<el-table-column label="数量" class-name="colorheader5"> <el-table-column label="数量" class-name="colorheader5">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span>{{ scope.row.data.扭后检测_含缺陷_分辨率?scope.row.data.扭后检测_含缺陷_分辨率:0}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader5"> <el-table-column label="比例" class-name="colorheader5">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span> <span>{{ scope.row.data.扭后检测_含缺陷_分辨率?scope.row.data.扭后检测_含缺陷_分辨率_比例:0}}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -226,24 +266,24 @@
<el-table-column label="加工数" align="center" class-name="colorheader6"> <el-table-column label="加工数" align="center" class-name="colorheader6">
<el-table-column label="数量" class-name="colorheader6"> <el-table-column label="数量" class-name="colorheader6">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.扭转检测_count_ok }} </span> <span>{{ scope.row.data.扭后检测_count_ok }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader6"> <el-table-column label="比例" class-name="colorheader6">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.扭转检测_合格率 }}</span> <span>{{ scope.row.data.扭后检测_合格率 }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="毛坯扭送" align="center" class-name="colorheader7"> <el-table-column label="毛坯扭送" align="center" class-name="colorheader7">
<el-table-column label="数量" class-name="colorheader7"> <el-table-column label="数量" class-name="colorheader7">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.扭转检测_count_ok }} </span> <span>{{ scope.row.data.扭后检测_count_ok }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="时间" class-name="colorheader7"> <el-table-column label="时间" class-name="colorheader7">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.扭转检测_合格率 }}</span> <span>{{ scope.row.data.扭后检测_合格率 }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -252,73 +292,83 @@
<el-table-column label="完好" class-name="colorheader1"> <el-table-column label="完好" class-name="colorheader1">
<el-table-column label="数量" class-name="colorheader1"> <el-table-column label="数量" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span v-if="scope.row.data.扭后检测_含缺陷_扭后炸纹&&scope.row.data.扭后检测_含缺陷_扭后炸废">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_扭后炸纹 - scope.row.data.扭后检测_含缺陷_扭后炸废 }}</span>
<span v-else>
<span v-if="scope.row.data.扭后检测_含缺陷_扭后炸纹">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_扭后炸纹 }}</span>
<span v-else-if="scope.row.data.扭后检测_含缺陷_扭后炸废">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_扭后炸废 }}</span>
<span v-else>{{ scope.row.data.扭后检测_count_use }}</span>
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader1"> <el-table-column label="比例" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span> <span v-if="scope.row.data.扭后检测_含缺陷_扭后炸纹&&scope.row.data.扭后检测_含缺陷_扭后炸废">{{100- scope.row.data.扭后检测_含缺陷_扭后炸纹 - scope.row.data.扭后检测_含缺陷_扭后炸废 }}%</span>
<span v-else>
<span v-if="scope.row.data.扭后检测_含缺陷_扭后炸纹">{{ 100 - scope.row.data.扭后检测_含缺陷_扭后炸纹_比例 }}</span>
<span v-else-if="scope.row.data.扭后检测_含缺陷_扭后炸废">{{100- scope.row.data.扭后检测_含缺陷_扭后炸废_比例 }}%</span>
<span v-else>100%</span>
</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="崩炸" class-name="colorheader1"> <el-table-column label="崩炸" class-name="colorheader1">
<el-table-column label="数量" class-name="colorheader1"> <el-table-column label="数量" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span>{{ scope.row.data.扭后检测_含缺陷_扭后炸纹?扭后检测_含缺陷_扭后炸纹:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader1"> <el-table-column label="比例" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span> <span>{{ scope.row.data.扭后检测_含缺陷_扭后炸纹?scope.row.data.扭后检测_含缺陷_扭后炸纹_比列:0 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="炸废" class-name="colorheader1"> <el-table-column label="炸废" class-name="colorheader1">
<el-table-column label="数量" class-name="colorheader1"> <el-table-column label="数量" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']?scope.row.data.扭转检测_count_use-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格']:scope.row.data.扭转检测_count_use }}</span> <span>{{ scope.row.data.扭后检测_含缺陷_扭后炸废?扭后检测_含缺陷_扭后炸废:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" class-name="colorheader1"> <el-table-column label="比例" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['扭转检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span> <span>{{ scope.row.data.扭后检测_含缺陷_扭后炸废?scope.row.data.扭后检测_含缺陷_扭后炸废_比列:0 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="扭转角" class-name="colorheader1"> <!-- <el-table-column label="扭转角" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.扭转检测_count_ok }} </span> <span>{{ scope.row.data.扭后检测_含缺陷_扭转角不合格 }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="改直" class-name="colorheader1"> <el-table-column label="改直" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.扭转检测_合格率 }}</span> <span>{{ scope.row.data.扭后检测_合格率 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外圆大" class-name="colorheader1"> <el-table-column label="外圆大" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.扭转检测_count_ok }} </span> <span>{{ scope.row.data.扭后检测_count_ok }} </span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="合计" class-name="colorheader1"> <el-table-column label="合计" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.扭转检测_count_ok }} </span> <span>{{ scope.row.data.扭后检测_count_ok }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合格率" class-name="colorheader1"> <el-table-column label="合格率" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.扭转检测_合格率 }}</span> <span>{{ scope.row.data.扭后检测_合格率 }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="外形偏(0.5mm)" align="center" class-name="colorheader2"> <!-- <el-table-column label="外形偏(0.5mm)" align="center" class-name="colorheader2">
</el-table-column> </el-table-column> -->
<el-table-column label="实验名称备注" prop="batch" align="center" class-name="colorheader3"> <el-table-column label="实验名称备注" prop="batch" align="center" class-name="colorheader3">
</el-table-column> </el-table-column>
<el-table-column label="检测设备" align="center" class-name="colorheader4"> <el-table-column label="检测设备" align="center" class-name="colorheader4">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.扭转检测_缺陷_备注 }}</span> <span>{{ scope.row.data.扭后检测_缺陷_备注 }}</span>
</template> </template>
</el-table-column> </el-table-column>
</scTable> </scTable>
@ -332,8 +382,8 @@ export default {
data() { data() {
return { return {
params: { params: {
ordering:'-data__扭转检测_小日期', ordering:'-data__扭后检测_小日期',
querys:[[{field:"data__has_key",compare:"",value:"扭转检测_日期"}]], querys:[[{field:"data__has_key",compare:"",value:"扭后检测_日期"}]],
}, },
query:{ query:{
name__contains:'', name__contains:'',
@ -341,7 +391,6 @@ export default {
last_time__gte:'', last_time__gte:'',
last_time__lte:'', last_time__lte:'',
}, },
// apiObj: this.$API.wpm.wpr.query,
apiObj: this.$API.wpm.batchstquery, apiObj: this.$API.wpm.batchstquery,
options:[], options:[],
tableData:[], tableData:[],
@ -350,9 +399,9 @@ export default {
methods: { methods: {
handleQuery(){ handleQuery(){
let that = this; let that = this;
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭转检测_批次号"}]]; let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]];
let obj = {},obj1 = {},obj2 = {},obj3 = {}; let obj = {},obj1 = {},obj2 = {},obj3 = {};
obj.field = 'data__扭转检测_批次号'; obj.field = 'data__扭后检测_批次号';
obj.value = that.query.batch__contains; obj.value = that.query.batch__contains;
obj.compare = ''; obj.compare = '';
@ -364,7 +413,7 @@ export default {
obj2.value = that.query.last_time__lte; obj2.value = that.query.last_time__lte;
obj2.compare = 'lte'; obj2.compare = 'lte';
obj3.field = 'data__扭转检测_物料名'; obj3.field = 'data__扭后检测_物料名';
obj3.value = that.query.name__contains; obj3.value = that.query.name__contains;
obj3.compare = ''; obj3.compare = '';

7
src/views/statistics/bxerp/workerTimes.vue
View File

@ -97,7 +97,12 @@ export default {
}, },
handleQuery(){ handleQuery(){
let that = this; let that = this;
that.getData(); if(that.query.user_name==null||that.query.user_name==''){
that.$message.error('请输入员工姓名');
}else{
that.getData();
}
}, },
}, },
}; };

10
src/views/wpm_bx/inmIn.vue
View File

@ -64,7 +64,7 @@
<el-table-column <el-table-column
label="物料名称" label="物料名称"
prop="material_name" prop="material_name"
min-width="150" min-width="160"
> >
<template #default="scope"> <template #default="scope">
{{ scope.row.material_name }} {{ scope.row.material_name }}
@ -76,10 +76,10 @@
<el-table-column <el-table-column
label="物料已到工序" label="物料已到工序"
prop="material_name" prop="material_name"
min-width="100" min-width="70"
> >
<template #default="scope"> <template #default="scope">
{{ scope.row.material_name.split('|').at(-1) }} <span v-if="scope.row.material_">{{ scope.row.material_.process_name}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -149,9 +149,9 @@
type="primary" type="primary"
style="margin-left: 10px;" style="margin-left: 10px;"
>检验</el-link> >检验</el-link>
<el-link :underline="false" type="primary" <!-- <el-link :underline="false" type="primary"
@click="handleWatch(scope.row)" @click="handleWatch(scope.row)"
>流程图</el-link> >流程图</el-link> -->
</template> </template>
</el-table-column> </el-table-column>
</scTable> </scTable>

10
src/views/wpm_bx/inmOut.vue
View File

@ -79,7 +79,7 @@
<el-table-column <el-table-column
label="物料名称" label="物料名称"
prop="material_name" prop="material_name"
min-width="120" min-width="160"
> >
<template #default="scope"> <template #default="scope">
{{ scope.row.material_name }} {{ scope.row.material_name }}
@ -91,10 +91,10 @@
<el-table-column <el-table-column
label="物料已到工序" label="物料已到工序"
prop="material_name" prop="material_name"
min-width="100" min-width="70"
> >
<template #default="scope"> <template #default="scope">
{{ scope.row.material_name.split('|').at(-1) }} <span v-if="scope.row.material_">{{ scope.row.material_.process_name}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -164,9 +164,9 @@
type="primary" type="primary"
style="margin-left: 10px;" style="margin-left: 10px;"
>检验</el-link> >检验</el-link>
<el-link :underline="false" type="primary" <!-- <el-link :underline="false" type="primary"
@click="handleWatch(scope.row)" @click="handleWatch(scope.row)"
>流程图</el-link> >流程图</el-link> -->
</template> </template>
</el-table-column> </el-table-column>
</scTable> </scTable>

97
src/views/wpm_bx/mlog_detail.vue
View File

@ -218,7 +218,6 @@
:apiObj="apiObj" :apiObj="apiObj"
row-key="id" row-key="id"
stripe stripe
height="250px"
:params="paramsIn" :params="paramsIn"
hidePagination hidePagination
> >
@ -600,9 +599,9 @@ export default {
that.isSubmit = res.submit_time==null?false:true; that.isSubmit = res.submit_time==null?false:true;
if(that.processType=='10'&&that.mlogItem.material_out_&&that.mlogItem.material_out_.tracking==20){ if(that.processType=='10'&&that.mlogItem.material_out_&&that.mlogItem.material_out_.tracking==20){
that.getMlogbw(); that.getMlogbw();
if(that.mlogItem.qct!==null){ // if(that.mlogItem.qct!==null){
that.getdefects(that.mlogItem.qct); // that.getdefects(that.mlogItem.qct);
} // }
} }
if(res.route!==null){ if(res.route!==null){
that.hasRoute = true; that.hasRoute = true;
@ -649,51 +648,51 @@ export default {
that.shiftOtions = res; that.shiftOtions = res;
}); });
}, },
getdefects(qct){ // getdefects(qct){
let that = this; // let that = this;
if(qct!==''&&qct!==null){//输出 // if(qct!==''&&qct!==null){//输出
that.$API.qm.qct.item.req(qct).then((res) => { // that.$API.qm.qct.item.req(qct).then((res) => {
that.qct_defects = []; // that.qct_defects = [];
that.testdefectss(res); // that.testdefectss(res);
}) // })
}else{ // }else{
that.$API.qm.qct.getQct.req({ material: that.mlogItem.material_out,type:'out',tag:'process' }).then((res) => { // that.$API.qm.qct.getQct.req({ material: that.mlogItem.material_out,type:'out',tag:'process' }).then((res) => {
that.testdefectss(res); // that.testdefectss(res);
}).catch(()=>{ // }).catch(()=>{
// that.getList(); // // that.getList();
}) // })
} // }
}, // },
testdefectss(res){ // testdefectss(res){
let that = this; // let that = this;
res.qct_defects.forEach((item) => { // res.qct_defects.forEach((item) => {
that.addTemplate[item.defect_name] = false; // that.addTemplate[item.defect_name] = false;
let obj = Object.assign({}, item); // let obj = Object.assign({}, item);
that.qct_defects.push(obj); // that.qct_defects.push(obj);
}) // })
that.qct_defects_origin = that.qct_defects; // that.qct_defects_origin = that.qct_defects;
that.qct_testitems = []; // that.qct_testitems = [];
res.qct_testitems.forEach((item2) => { // res.qct_testitems.forEach((item2) => {
if(item2.testitem_type!=='20'){ // if(item2.testitem_type!=='20'){
let obj2 = Object.assign({}, item2); // let obj2 = Object.assign({}, item2);
obj2.value = ''; // obj2.value = '';
obj2.addto_wpr = item2.addto_wpr; // obj2.addto_wpr = item2.addto_wpr;
if(item2.testitem_field_type=='input-number'||item2.testitem_field_type=='input-int'){ // if(item2.testitem_field_type=='input-number'||item2.testitem_field_type=='input-int'){
obj2.value = null; // obj2.value = null;
that.addTemplate[item2.testitem_name] = null; // that.addTemplate[item2.testitem_name] = null;
} // }
if(item2.testitem_field_type=='select-text'||item2.testitem_field_type=='selects-text'){ // if(item2.testitem_field_type=='select-text'||item2.testitem_field_type=='selects-text'){
let str = obj2.testitem_choices.replace(/'/g, '"'); // let str = obj2.testitem_choices.replace(/'/g, '"');
let arr = JSON.parse(str); // let arr = JSON.parse(str);
obj2.testitem_choices = arr; // obj2.testitem_choices = arr;
that.addTemplate[item2.testitem_name] = null; // that.addTemplate[item2.testitem_name] = null;
} // }
that.qct_testitems.push(obj2); // that.qct_testitems.push(obj2);
} // }
}) // })
that.qct_testitems_origin = that.qct_testitems; // that.qct_testitems_origin = that.qct_testitems;
// that.getList(); // // that.getList();
}, // },
//获取生产工序的mlogbw //获取生产工序的mlogbw
getMlogbw(){ getMlogbw(){
let that = this; let that = this;

2
src/views/wpm_bx/mlog_form.vue
View File

@ -332,7 +332,7 @@ export default {
res.results.forEach((item) => { res.results.forEach((item) => {
let obj = {}; let obj = {};
Object.assign(obj, item); Object.assign(obj, item);
obj.value = ''; obj.value = null;
that.testitems.push(obj); that.testitems.push(obj);
}) })
}); });

2
src/views/wpm_bx/mlog_form2.vue
View File

@ -295,7 +295,7 @@ export default {
res.results.forEach((item) => { res.results.forEach((item) => {
let obj = {}; let obj = {};
Object.assign(obj, item); Object.assign(obj, item);
obj.value = ''; obj.value = null;
that.testitems.push(obj); that.testitems.push(obj);
}) })
}); });

6
src/views/wpm_bx/mlogbw_check.vue
View File

@ -546,7 +546,7 @@ export default {
selectWprList:[], selectWprList:[],
qct_defects_origin:[], qct_defects_origin:[],
selectWpr:[], selectWpr:[],
tableHeight:500, tableHeight:null,
apiObjPrint:this.$API.cm.labelmat.fromWm, apiObjPrint:this.$API.cm.labelmat.fromWm,
printer_name:localStorage.getItem("printer_name") printer_name:localStorage.getItem("printer_name")
}; };
@ -597,9 +597,7 @@ export default {
} }
} }
that.visible = true; that.visible = true;
setTimeout(() => { that.tableHeight = document.getElementsByClassName('el-drawer__body')[0].clientHeight-40;
that.tableHeight = document.getElementById('mlogbwMain').clientHeight-20;
},500)
}, },
//获取输入的testItem //获取输入的testItem
gettestitem(){ gettestitem(){

55
src/views/wpm_bx/mlogbw_check_table.vue
View File

@ -134,13 +134,13 @@
<el-button <el-button
v-if="!scope.row.isEdit" v-if="!scope.row.isEdit"
type="primary" type="primary"
@click="formTableEdit(scope.row)" @click="formTableEdit(scope.$index)"
>编辑</el-button> >编辑</el-button>
<el-button <el-button
v-if="scope.row.isEdit&&!scope.row.id" v-if="scope.row.isEdit&&!scope.row.id"
type="danger" type="danger"
style="margin-left: 5px;" style="margin-left: 5px;"
@click="formTableDelet(scope.row)" @click="formTableDelet(scope.row,scope.$index)"
>删除</el-button> >删除</el-button>
<el-button <el-button
v-if="!scope.row.isEdit" v-if="!scope.row.isEdit"
@ -411,6 +411,7 @@ export default {
test_user:"", test_user:"",
equipment:"", equipment:"",
equipment_name:"", equipment_name:"",
cd_req_addr:null,//请求数据接口地址
testitemids : [], testitemids : [],
defectids : [], defectids : [],
}, },
@ -450,7 +451,7 @@ export default {
that.tableHeight = document.getElementById('mlogbwMain').clientHeight-20; that.tableHeight = document.getElementById('mlogbwMain').clientHeight-20;
},500) },500)
that.route_code = that.$route.path.split("/")[2]; that.route_code = that.$route.path.split("/")[2];
that.hideAdd = that.isSubmit; // that.hideAdd = that.isSubmit;
that.currentDate = that.$TOOL.dateFormat2(new Date()); that.currentDate = that.$TOOL.dateFormat2(new Date());
}, },
methods: { methods: {
@ -598,6 +599,12 @@ export default {
//添加 //添加
formTableSave(row) { formTableSave(row) {
let that = this; let that = this;
let editIndex = 0;
that.mlogbwlist.forEach((item,index) => {
if(item.id==row.id){
editIndex = index;
}
})
let obj = {}; let obj = {};
obj.number = row.number; obj.number = row.number;
obj.mlogb = row.mlogb; obj.mlogb = row.mlogb;
@ -605,7 +612,7 @@ export default {
obj.note = row.note; obj.note = row.note;
//qct不为空，有检验表 //qct不为空，有检验表
if(that.qct!==''&&that.qct!==null){ if(that.qct!==''&&that.qct!==null){
that.qct_defects_origin.forEach(item => { that.qct_defects.forEach(item => {
if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){ if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){
let str = item.rule_expression.replace(/`/g, ''); let str = item.rule_expression.replace(/`/g, '');
str = str.replace(/\${(.*?)}/g, 'row.\$1') str = str.replace(/\${(.*?)}/g, 'row.\$1')
@ -645,7 +652,8 @@ export default {
obj.id = row.id; obj.id = row.id;
that.$API.wpm.mlogbw.update.req(row.id,obj).then((res) => { that.$API.wpm.mlogbw.update.req(row.id,obj).then((res) => {
that.$message.success("保存成功"); that.$message.success("保存成功");
that.getList(); that.mlogbwlist[editIndex].isEdit = false;
// that.getList();
return res; return res;
}).catch((err) => { }).catch((err) => {
return err; return err;
@ -653,7 +661,8 @@ export default {
}else{ }else{
that.$API.wpm.mlogbw.create.req(obj).then((res) => { that.$API.wpm.mlogbw.create.req(obj).then((res) => {
that.$message.success("添加成功"); that.$message.success("添加成功");
that.getList(); that.mlogbwlist[editIndex].isEdit = false;
// that.getList();
return res; return res;
}).catch((err) => { }).catch((err) => {
return err; return err;
@ -667,32 +676,29 @@ export default {
} }
}); });
}, },
formTableEdit(row) { formTableEdit(index) {
let that = this; let that = this;
if(that.route_code=='niuzhuan'&&that.optionsEq.length==0){ that.mlogbwlist[index].isEdit = true;
that.getEquipment4(); let date = new Date();
if(that.mlogbwlist[index].work_start_time==''||that.mlogbwlist[index].work_start_time==null){
that.mlogbwlist[index].work_start_time = that.$TOOL.dateFormat(date, 'yyyy-MM-dd hh:mm:ss');
}
if(that.setForm.cd_req_addr!==null&&that.setForm.cd_req_addr!==""&&that.setForm.cd_req_addr!==undefined){
that.getEqData(index);
} }
that.mlogbwlist.forEach((item, index) => {
if (item.id == row.id) {
that.mlogbwlist[index].isEdit = true;
let date = new Date();
if(that.mlogbwlist[index].work_start_time==''||that.mlogbwlist[index].work_start_time==null){
that.mlogbwlist[index].work_start_time = that.$TOOL.dateFormat(date, 'yyyy-MM-dd hh:mm:ss');
}
}
});
}, },
formTableDelet(row){ formTableDelet(row){
this.mlogbwlist.pop(); this.mlogbwlist.pop();
}, },
//删除 //删除
formTableDel(id) { formTableDel(id,index) {
let that = this; let that = this;
that.$confirm(`确定删除吗？`, "提示", { that.$confirm(`确定删除吗？`, "提示", {
type: "warning", type: "warning",
}).then(() => { }).then(() => {
that.$API.wpm.mlogbw.delete.req(id).then((res) => { that.$API.wpm.mlogbw.delete.req(id).then((res) => {
that.getList(); that.getList();
that.mlogbwlist.splice(index,1);
that.$message.success("删除成功"); that.$message.success("删除成功");
}).catch((err) => { }).catch((err) => {
return err; return err;
@ -716,7 +722,7 @@ export default {
defectCountSun(row){ defectCountSun(row){
let that = this; let that = this;
let index = that.mlogbwlist.indexOf(row); let index = that.mlogbwlist.indexOf(row);
that.qct_defects_origin.forEach(item => { that.qct_defects.forEach(item => {
if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){ if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){
let str = item.rule_expression.replace(/`/g, ''); let str = item.rule_expression.replace(/`/g, '');
str = str.replace(/\${(.*?)}/g, 'row.\$1') str = str.replace(/\${(.*?)}/g, 'row.\$1')
@ -771,7 +777,7 @@ export default {
that.equipmentOptions.forEach(item => { that.equipmentOptions.forEach(item => {
if(item.id == that.form.equipment){ if(item.id == that.form.equipment){
that.form.equipment_name = item.name; that.form.equipment_name = item.name;
that.form.cd_req_addr=item.cd_req_addr; that.form.cd_req_addr = that.setForm.cd_req_addr = item.cd_req_addr;
} }
}); });
}, },
@ -883,7 +889,7 @@ export default {
that.mlogbwlist.splice(index,1); that.mlogbwlist.splice(index,1);
that.wprInputText = ""; that.wprInputText = "";
that.mlogbwlist.unshift(obj); that.mlogbwlist.unshift(obj);
if(that.setForm.cd_req_addr!==null){ if(that.setForm.cd_req_addr!==null&&that.setForm.cd_req_addr!==""&&that.setForm.cd_req_addr!==undefined){
//执行cd_req_addr,获取检测设备的数据 //执行cd_req_addr,获取检测设备的数据
that.getEqData(0); that.getEqData(0);
} }
@ -899,6 +905,11 @@ export default {
} }
}) })
}).catch((err) => { }).catch((err) => {
console.log(err);
this.$notify.error({
title: '获取数据失败',
message: err.data
})
return err; return err;
}); });
}, },

18
src/views/wpm_bx/mlogs.vue
View File

@ -83,6 +83,15 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="棒号" min-width="80" v-if="route_code=='paiyicibang'">
<template #default="scope">
<div v-if="scope.row.mlogbw_number_list.length>0">
<span v-for="item in scope.row.mlogbw_number_list" :key="item">
<span >{{ item }}、</span>
</span>
</div>
</template>
</el-table-column>
<el-table-column label="板段号" min-width="160" v-if="route_code=='paiban'||route_code=='zhuangmo'||route_code=='tuomoceliang'||route_code=='reyatuihuo'||route_code=='zlybcl'"> <el-table-column label="板段号" min-width="160" v-if="route_code=='paiban'||route_code=='zhuangmo'||route_code=='tuomoceliang'||route_code=='reyatuihuo'||route_code=='zlybcl'">
<template #default="scope"> <template #default="scope">
<div v-if="scope.row.mlogbw_number_list.length>0"> <div v-if="scope.row.mlogbw_number_list.length>0">
@ -120,22 +129,22 @@
<span v-if="scope.row.oinfo_json_">{{scope.row.oinfo_json_.是否保温}}</span> <span v-if="scope.row.oinfo_json_">{{scope.row.oinfo_json_.是否保温}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="温度" v-if="route_code=='zlybcl'"> <el-table-column label="温度(℃)" v-if="route_code=='zlybcl'">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.oinfo_json_">{{scope.row.oinfo_json_.温度}}</span> <span v-if="scope.row.oinfo_json_">{{scope.row.oinfo_json_.温度}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="压力" v-if="route_code=='zlybcl'"> <el-table-column label="压力(mpa)" v-if="route_code=='zlybcl'">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.oinfo_json_">{{scope.row.oinfo_json_.压力}}</span> <span v-if="scope.row.oinfo_json_">{{scope.row.oinfo_json_.压力}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="刻度" v-if="route_code=='zlybcl'"> <el-table-column label="刻度(mm)" v-if="route_code=='zlybcl'">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.oinfo_json_">{{scope.row.oinfo_json_.刻度}}</span> <span v-if="scope.row.oinfo_json_">{{scope.row.oinfo_json_.刻度}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="压板用时" v-if="route_code=='zlybcl'"> <el-table-column label="压板用时(分)" v-if="route_code=='zlybcl'">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.oinfo_json_">{{scope.row.oinfo_json_.压板用时}}</span> <span v-if="scope.row.oinfo_json_">{{scope.row.oinfo_json_.压板用时}}</span>
</template> </template>
@ -143,7 +152,6 @@
<el-table-column <el-table-column
label="处理人" label="处理人"
prop="handle_user_name" prop="handle_user_name"
width="80"
></el-table-column> ></el-table-column>
<el-table-column label="保温剩余时间" v-if="mgroup_name=='黑化'||mgroup_name=='退火'"> <el-table-column label="保温剩余时间" v-if="mgroup_name=='黑化'||mgroup_name=='退火'">
<template #default="scope"> <template #default="scope">

10
src/views/wpm_bx/monitor_detail.vue
View File

@ -9,7 +9,7 @@
> >
<div id="tableWap" style="height: 100%;"> <div id="tableWap" style="height: 100%;">
<el-tabs v-model="activeName" @tab-change="handleClick"> <el-tabs v-model="activeName" @tab-change="handleClick">
<el-tab-pane v-for="item in mpointList" :label="item.name" :name="item.name" :key="item.id" lazy> <el-tab-pane v-for="item in mpointList" :label="item.nickname" :name="item.nickname" :key="item.id" lazy>
<scTable <scTable
ref="table" ref="table"
:apiObj="apiObj" :apiObj="apiObj"
@ -103,7 +103,7 @@ export default {
that.$API.enm.mpoint.list.req({ep_belong:that.equipmentId,page:0}).then((res) => { that.$API.enm.mpoint.list.req({ep_belong:that.equipmentId,page:0}).then((res) => {
if(res.length>0){ if(res.length>0){
that.mpointList = res; that.mpointList = res;
that.activeName = res[0].name; that.activeName = res[0].nickname;
that.params.mpoint = res[0].id; that.params.mpoint = res[0].id;
that.apiObj = that.$API.enm.mplogx; that.apiObj = that.$API.enm.mplogx;
that.handleClick(); that.handleClick();
@ -116,7 +116,7 @@ export default {
console.log('handleClick',val) console.log('handleClick',val)
let that = this; let that = this;
that.mpointList.forEach(item=>{ that.mpointList.forEach(item=>{
if(item.name == that.activeName){ if(item.nickname == that.activeName){
that.query.mpoint = item.id; that.query.mpoint = item.id;
that.query.page = 1; that.query.page = 1;
that.option.title.text = that.activeName; that.option.title.text = that.activeName;
@ -129,9 +129,9 @@ export default {
params.page = 0; params.page = 0;
that.$API.enm.mplogx.req(params).then((res) => { that.$API.enm.mplogx.req(params).then((res) => {
res.forEach(item=>{ res.forEach(item=>{
that.option.xAxis.data.push(item.timex); that.option.xAxis.data.unshift(item.timex);
let value = Number(item.val_float).toFixed(3); let value = Number(item.val_float).toFixed(3);
that.option.series.data.push(value); that.option.series.data.unshift(value);
}) })
}) })
} }