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-12-19 15:46:33 +08:00
parent 9806e264d8 a6d1b01702
commit e6069242fe
11 changed files with 190 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/views/bigScreen/index_photon.vue
View File

@ -966,41 +966,30 @@ export default {
}, },
getMaterialList() { getMaterialList() {
let that = this; let that = this;
this.$API.mtm.material.list let obj = {
.req({ page: 0, type: 20, count__gte: 1 }) query: {
.then((res) => { "select_dept": "",
let data = []; "groupby_dept": "",
if (res.length > 0) { "material_types": "20",
res.forEach((item) => { "select_material": "material.name as material_name",
let arr = []; "groupby_material": "material.name",
let colorText = ""; "select_material_name": "",
if ( "groupby_material_name": ""
item.count_safe !== null &&
item.count_safe < item.count
) {
colorText =
'<span style="color:red;">' +
item.count +
"</span>";
} else {
colorText =
'<span style="color:green;">' +
item.count +
"</span>";
} }
arr[0] = };
item.name + that.$API.bi.dataset.exec.req("materialCount", obj).then((res) => {
"|" + let data = [];
item.specification + let list = res.data2.ds0;
"|" + if (list.length > 0) {
item.model; list.forEach((item) => {
let arr = [];
arr[0] = item.material_name ;
arr[1] = item.count; arr[1] = item.count;
data.push(arr); data.push(arr);
}); });
} }
that.taskBoard.data = data; that.taskBoard.data = data;
// console.log('getMaterialList', data) })
});
}, },
showTime() { showTime() {
this.currentTime = this.$TOOL.dateFormat(new Date(), "hh:mm:ss"); this.currentTime = this.$TOOL.dateFormat(new Date(), "hh:mm:ss");

6
src/views/inm/mainso_mio.vue
View File

@ -173,7 +173,7 @@
:type="type" :type="type"
:cate="cate" :cate="cate"
:mioId="mioId" :mioId="mioId"
@closed="visibleDrawer = false" @closed="closedFun"
> >
</record-dialog> </record-dialog>
</template> </template>
@ -307,6 +307,10 @@ export default {
handleSaveSuccess() { handleSaveSuccess() {
this.$refs.table.refresh(); this.$refs.table.refresh();
}, },
closedFun(){
this.visibleDrawer = false;
this.$refs.table.refresh();
},
}, },
}; };
</script> </script>

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

@ -816,8 +816,8 @@
</el-form> </el-form>
</el-header> </el-header>
<el-main style="padding: 0 20px 20px 20px" id="mioitemwMain"> <el-main style="padding: 0 20px 20px 20px" id="mioitemwMain">
<scTable :tableHeight="tableHeight" :data="mioitemwList" border hideDo hidePagination> <scTable :tableHeight="tableHeight" :data="mioitemwList" row-key="id" border hideDo hidePagination>
<el-table-column label="物料编号" prop="number"> <el-table-column label="物料编号" prop="number" min-width="170px" fixed="left">
</el-table-column> </el-table-column>
<el-table-column prop="note" :label="item.testitem_name" v-for="item in qct_testitems" :key="item.id" width="150px"> <el-table-column prop="note" :label="item.testitem_name" v-for="item in qct_testitems" :key="item.id" width="150px">
<template #default="scope"> <template #default="scope">

11
src/views/login/components/passwordForm.vue
View File

@ -18,8 +18,9 @@
<el-col :span="12" class="login-reg"> <el-col :span="12" class="login-reg">
<!-- <el-link @click="visitors">{{$t('login.fangke')}}</el-link> --> <!-- <el-link @click="visitors">{{$t('login.fangke')}}</el-link> -->
</el-col> </el-col>
<el-col :span="12" class="login-forgot"> <el-col :span="12" class="login-forgot" >
<router-link to="/reset_password">{{ $t("login.forgetPassword") }}？</router-link> <span v-if="project_code=='bxerp'||project_code=='tcerp'"></span>
<router-link to="/reset_password" v-else>{{ $t("login.forgetPassword") }}？</router-link>
</el-col> </el-col>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -64,6 +65,7 @@ export default {
return { return {
redirect: undefined, redirect: undefined,
userType: "admin", userType: "admin",
project_code:"",
visitorsdialog: false, visitorsdialog: false,
visitorform: {}, visitorform: {},
form: { form: {
@ -105,7 +107,10 @@ export default {
immediate: true, immediate: true,
}, },
}, },
mounted() { }, mounted() {
this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;
console.log('this.project_code',this.project_code);
},
methods: { methods: {
async login() { async login() {
let that = this; let that = this;

11
src/views/statistics/bxerp/defect.vue
View File

@ -53,7 +53,7 @@
<span v-if="scope.row.剪切合格">{{((scope.row.剪切合格/scope.row.总切片数)*100).toFixed(2) }}%</span> <span v-if="scope.row.剪切合格">{{((scope.row.剪切合格/scope.row.总切片数)*100).toFixed(2) }}%</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="剪切加功率"> <el-table-column label="剪切加工率">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row['剪切￠18.3mm不合格']">{{ (((scope.row.总切片数-scope.row['剪切￠18.3mm不合格'].含)/scope.row.总切片数)*100).toFixed(2) }}%</span> <span v-if="scope.row['剪切￠18.3mm不合格']">{{ (((scope.row.总切片数-scope.row['剪切￠18.3mm不合格'].含)/scope.row.总切片数)*100).toFixed(2) }}%</span>
<span v-else>100%</span> <span v-else>100%</span>
@ -71,14 +71,15 @@
<span v-else>0%</span> <span v-else>0%</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="加功率"> <el-table-column label="加工率">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.总切片合格数">{{((scope.row.总切片合格数/scope.row.总切片数)*100).toFixed(2) }}%</span> <span v-if="scope.row.总切片完全合格数">{{((scope.row.加工率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合格率" prop="合格率"> <el-table-column label="合格率" prop="合格率">
<!-- 暗点合格并且剪切合格的板段数：在暗点合格含里刨除剪切可加工和剪切不合格 -->
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.总切片完全合格数">{{((scope.row.总切片完全合格数/scope.row.总切片数)*100).toFixed(2) }}%</span> <span v-if="scope.row.总切片完全合格数">{{((scope.row.暗点合格.仅/scope.row.总切片数)*100).toFixed(2) }}%</span>
</template> </template>
</el-table-column> </el-table-column>
</scTable> </scTable>
@ -87,7 +88,6 @@
</template> </template>
<script> <script>
import { genTree } from "@/utils/verificate";
export default { export default {
name: "workerTimes", name: "workerTimes",
data() { data() {
@ -131,6 +131,7 @@ export default {
} }
item.不合格数 = 0; item.不合格数 = 0;
item.可加工数 = 0; item.可加工数 = 0;
item.加工率数 = item.总切片合格数?item.总切片合格数:0-item.暗点不合格.含?item.暗点合格.含:0;
if(item['剪切￠18.3mm不合格']){ if(item['剪切￠18.3mm不合格']){
if(item['剪切￠18.3mm可加工']){ if(item['剪切￠18.3mm可加工']){
item.剪切合格 = item.总切片数 - item['剪切￠18.3mm可加工'].含- item['剪切￠18.3mm不合格'].含; item.剪切合格 = item.总切片数 - item['剪切￠18.3mm可加工'].含- item['剪切￠18.3mm不合格'].含;

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

@ -8,6 +8,7 @@
v-model="query.user_name" v-model="query.user_name"
:valueField="'name'" :valueField="'name'"
:labelField="'name'" :labelField="'name'"
:params="params"
v-model:label="query.user_name" v-model:label="query.user_name"
style="width:150px; margin-right: 5px;" style="width:150px; margin-right: 5px;"
> >
@ -86,6 +87,9 @@ export default {
user_name:'', user_name:'',
start_date:'', start_date:'',
}, },
params:{
ubelong_dept__name:"冷加工",
},
lists:[], lists:[],
mgruops:[], mgruops:[],
tableData:[], tableData:[],
@ -161,7 +165,7 @@ export default {
let all = 0; let all = 0;
that.coefficient.forEach(item2 => { that.coefficient.forEach(item2 => {
if(item1[item2]){ if(item1[item2]){
all = all+ Number(item1[item2])*Number(that.tableData[0][item2]) all = all+ Number(item1[item2])/Number(that.tableData[0][item2])
} }
}) })
item1.time_all = all+Number(item1.time_other); item1.time_all = all+Number(item1.time_other);
@ -174,7 +178,7 @@ export default {
console.log('index',index) console.log('index',index)
that.coefficient.forEach(item2 => { that.coefficient.forEach(item2 => {
if(that.tableData[index][item2]){ if(that.tableData[index][item2]){
all = all+ Number(that.tableData[index][item2])*Number(that.tableData[0][item2]) all = all+ Number(that.tableData[index][item2])/Number(that.tableData[0][item2])
} }
that.tableData[index].time_all = all+Number(that.tableData[index].time_other); that.tableData[index].time_all = all+Number(that.tableData[index].time_other);
}) })

78
src/views/statistics/bxerp/zhongjian1.vue
View File

@ -43,6 +43,21 @@
</el-table-column> </el-table-column>
<el-table-column label="板号" prop="number" fixed="left"> <el-table-column label="板号" prop="number" fixed="left">
</el-table-column> </el-table-column>
<el-table-column label="炸" align="center" class-name="colorheader1">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_炸?scope.row.data.中检一_缺陷项_炸:0 }}</span>
</template>
</el-table-column>
<el-table-column label="偏" align="center" class-name="colorheader2">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_偏?scope.row.data.中检一_缺陷项_偏:0 }}</span>
</template>
</el-table-column>
<el-table-column label="掉头" align="center" class-name="colorheader2">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_掉头?scope.row.data.中检一_缺陷项_掉头:0 }}</span>
</template>
</el-table-column>
<el-table-column label="台阶划伤" align="center" class-name="colorheader1"> <el-table-column label="台阶划伤" align="center" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_台阶划伤?scope.row.data.中检一_缺陷项_台阶划伤:0 }}</span> <span>{{ scope.row.data.中检一_缺陷项_台阶划伤?scope.row.data.中检一_缺陷项_台阶划伤:0 }}</span>
@ -63,64 +78,44 @@
<span>{{ scope.row.data.中检一_缺陷项_台糙?scope.row.data.中检一_缺陷项_台糙:0 }}</span> <span>{{ scope.row.data.中检一_缺陷项_台糙?scope.row.data.中检一_缺陷项_台糙:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外黑" align="center" class-name="colorheader5">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_外黑?scope.row.data.中检一_缺陷项_外黑:0 }}</span>
</template>
</el-table-column>
<el-table-column label="尺寸大/小" align="center" class-name="colorheader6"> <el-table-column label="尺寸大/小" align="center" class-name="colorheader6">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['中检一_缺陷项_尺寸大/小']?scope.row.data['中检一_缺陷项_尺寸大/小']:0 }}</span> <span>{{ scope.row.data['中检一_缺陷项_尺寸大/小']?scope.row.data['中检一_缺陷项_尺寸大/小']:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="拆头" align="center" class-name="colorheader7">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_拆头?scope.row.data.中检一_缺陷项_拆头:0 }}</span>
</template>
</el-table-column>
<el-table-column label="外磕" align="center" class-name="colorheader1">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_外磕?scope.row.data.中检一_缺陷项_外磕:0 }}</span>
</template>
</el-table-column>
<el-table-column label="掉头" align="center" class-name="colorheader2">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_掉头?scope.row.data.中检一_缺陷项_掉头:0 }}</span>
</template>
</el-table-column>
<el-table-column label="打毛/打台" align="center" class-name="colorheader3">
<template #default="scope">
<span>{{ scope.row.data['中检一_缺陷项_打毛/打台']?scope.row.data['中检一_缺陷项_打毛/打台']:0 }}</span>
</template>
</el-table-column>
<el-table-column label="量崩" align="center" class-name="colorheader4">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_量崩?scope.row.data.中检一_缺陷项_量崩:0 }}</span>
</template>
</el-table-column>
<el-table-column label="崩" align="center" class-name="colorheader5"> <el-table-column label="崩" align="center" class-name="colorheader5">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_崩?scope.row.data.中检一_缺陷项_崩:0 }}</span> <span>{{ scope.row.data.中检一_缺陷项_崩?scope.row.data.中检一_缺陷项_崩:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="喷码" align="center" class-name="colorheader6">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_喷码?scope.row.data.中检一_缺陷项_喷码:0 }}</span>
</template>
</el-table-column>
<el-table-column label="修崩/炸" align="center" class-name="colorheader7"> <el-table-column label="修崩/炸" align="center" class-name="colorheader7">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['中检一_缺陷项_修崩/炸']?scope.row.data['中检一_缺陷项_修崩/炸']:0 }}</span> <span>{{ scope.row.data['中检一_缺陷项_修崩/炸']?scope.row.data['中检一_缺陷项_修崩/炸']:0 }}</span>
</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="colorheader7">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_炸?scope.row.data.中检一_缺陷项_炸:0 }}</span> <span>{{ scope.row.data.中检一_缺陷项_拆头?scope.row.data.中检一_缺陷项_拆头:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="偏" align="center" class-name="colorheader2"> <el-table-column label="外黑" align="center" class-name="colorheader5">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_偏?scope.row.data.中检一_缺陷项_偏:0 }}</span> <span>{{ scope.row.data.中检一_缺陷项_外黑?scope.row.data.中检一_缺陷项_外黑:0 }}</span>
</template>
</el-table-column>
<el-table-column label="外磕" align="center" class-name="colorheader1">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_外磕?scope.row.data.中检一_缺陷项_外磕:0 }}</span>
</template>
</el-table-column>
<el-table-column label="打毛/打台" align="center" class-name="colorheader3">
<template #default="scope">
<span>{{ scope.row.data['中检一_缺陷项_打毛/打台']?scope.row.data['中检一_缺陷项_打毛/打台']:0 }}</span>
</template>
</el-table-column>
<el-table-column label="喷码" align="center" class-name="colorheader6">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_喷码?scope.row.data.中检一_缺陷项_喷码:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="掉皮" align="center" class-name="colorheader3"> <el-table-column label="掉皮" align="center" class-name="colorheader3">
@ -128,6 +123,11 @@
<span>{{ scope.row.data.中检一_缺陷项_掉皮?scope.row.data.中检一_缺陷项_掉皮:0 }}</span> <span>{{ scope.row.data.中检一_缺陷项_掉皮?scope.row.data.中检一_缺陷项_掉皮:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="量崩" align="center" class-name="colorheader4">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_量崩?scope.row.data.中检一_缺陷项_量崩:0 }}</span>
</template>
</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>

9
src/views/statistics/statistics_bang.vue
View File

@ -509,7 +509,8 @@
</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 v-if="scope.row.data">{{ scope.row.data.库存_count }}</span> <!-- <span v-if="scope.row.data">{{ scope.row.data.仓库_count }}</span> -->
<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_count?scope.row.data.六车间生产入库_count:0 - scope.row.data.销售发货_count?scope.row.data.销售发货_count:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组合件批次号" class-name="colorheader7"> <el-table-column label="组合件批次号" class-name="colorheader7">
@ -519,17 +520,17 @@
</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 v-if="scope.row.data">{{ scope.row.data.销售发货_count }}</span> <span v-if="scope.row.data">{{ scope.row.data.销售发货_count?scope.row.data.销售发货_count:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="6号领取加工-发货合格率" class-name="colorheader2"> <el-table-column label="6号领取加工-发货合格率" class-name="colorheader2">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.data&&(scope.row.data.六车间_批次发货合格率||scope.row.data.六车间_批次发货合格率==0)">{{ scope.row.data.六车间_批次发货合格率 }}%</span> <span v-if="scope.row.data&&(scope.row.data.六车间领料_count?scope.row.data.六车间领料_count:0+scope.row.data.六车间交接领料_count?scope.row.data.六车间交接领料_count:0)>0">{{ scope.row.data.六车间生产入库_count?scope.row.data.六车间生产入库_count:0/(scope.row.data.六车间领料_count?scope.row.data.六车间领料_count:0+scope.row.data.六车间交接领料_count?scope.row.data.六车间交接领料_count:0)}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="7号生产-发货合格率" class-name="colorheader3"> <el-table-column label="7号生产-发货合格率" class-name="colorheader3">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.data&&(scope.row.data.七车间_批次发货合格率||scope.row.data.七车间_批次发货合格率==0)">{{ scope.row.data.七车间_批次发货合格率 }}%</span> <span v-if="scope.row.data&&scope.row.data.棒料成型_count_ok?scope.row.data.棒料成型_count_ok:0>0">{{ (scope.row.data.六车间生产入库_count?scope.row.data.六车间生产入库_count:0)/scope.row.data.棒料成型_count_ok?scope.row.data.棒料成型_count_ok:0}}</span>
</template> </template>
</el-table-column> </el-table-column>
</scTable> </scTable>

74
src/views/statistics/statistics_guan.vue
View File

@ -252,7 +252,7 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="6号车间" align="center" class-name="colorheader4"> <el-table-column label="6号车间" align="center" class-name="colorheader4">
<el-table-column label="库存领料" align="center" class-name="colorheader4"> <!-- <el-table-column label="库存领料" align="center" class-name="colorheader4">
<el-table-column label="领取时间" width="160px" class-name="colorheader4"> <el-table-column label="领取时间" width="160px" class-name="colorheader4">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.六车间领料_日期 }}</span> <span v-if="scope.row.data">{{ scope.row.data.六车间领料_日期 }}</span>
@ -278,26 +278,71 @@
<span v-if="scope.row.data">{{ scope.row.data.六车间领料_备注 }}</span> <span v-if="scope.row.data">{{ 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="colorheader4"> <el-table-column label="领料" align="center" class-name="colorheader4">
<el-table-column label="领取时间" width="160px" class-name="colorheader4"> <el-table-column label="领取时间" width="160px" class-name="colorheader4">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.六车间交接领料_日期 }}</span> <span v-if="scope.row.data&&scope.row.data.六车间领料_日期 ">{{ scope.row.data.六车间领料_日期 }}</span>
<span v-if="scope.row.data&&scope.row.data.六车间领料_日期&&scope.row.data.六车间交接领料_日期">;</span>
<span v-if="scope.row.data&&scope.row.data.六车间交接领料_日期 ">{{ scope.row.data.六车间交接领料_日期 }}</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 v-if="scope.row.data">{{ scope.row.data.六车间交接领料_count }}</span> <span v-if="scope.row.data&&scope.row.data.六车间领料_count">{{ scope.row.data.六车间领料_count + scope.row.data.六车间交接领料_count?scope.row.data.六车间交接领料_count:0 }}</span>
<span v-else>{{ scope.row.data.六车间交接领料_count?scope.row.data.六车间交接领料_count:'' }}</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 v-if="scope.row.data">{{ scope.row.data.六车间交接领料_送料人 }}</span> <span v-if="scope.row.data">{{ scope.row.data.六车间领料_仓库执行人?scope.row.data.六车间领料_仓库执行人:'' }}{{ scope.row.data.六车间交接领料_送料人?scope.row.data.六车间交接领料_送料人:'' }}</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 v-if="scope.row.data">{{ scope.row.data.六车间交接领料_接料人 }}</span> <span v-if="scope.row.data">{{ scope.row.data.六车间领料_车间执行人?scope.row.data.六车间领料_车间执行人:'' }}{{ scope.row.data.六车间交接领料_接料人?scope.row.data.六车间交接领料_接料人:'' }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="工前检验" align="center" class-name="colorheader3">
<el-table-column label="加工数" class-name="colorheader3">
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.六车间_工前检验_count_real }}</span>
</template>
</el-table-column>
<el-table-column label="合格率" class-name="colorheader3">
<template #default="scope">
<span v-if="scope.row.data&&(scope.row.data.六车间_工前检验_合格率||scope.row.data.六车间_工前检验_合格率==0)">{{ scope.row.data.六车间_工前检验_合格率 }}%</span>
</template>
</el-table-column>
<el-table-column label="不合格数" class-name="colorheader3">
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.六车间_工前检验_count_notok }}</span>
</template>
</el-table-column>
<el-table-column label="断裂" class-name="colorheader3">
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.六车间_工前检验_count_n_dl }}</span>
</template>
</el-table-column>
<el-table-column label="其他" class-name="colorheader3">
<template #default="scope">
<span v-if="scope.row.data">{{getCountQt(scope.row.data,'工前检验')}}</span>
</template>
</el-table-column>
<el-table-column label="加工日期" min-width="160" class-name="colorheader3">
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.六车间_工前检验_日期 }}</span>
</template>
</el-table-column>
<el-table-column label="操作人" class-name="colorheader3">
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.六车间_工前检验_操作人 }}</span>
</template>
</el-table-column>
<el-table-column label="备注" class-name="colorheader3">
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.六车间_工前检验_备注 }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -501,9 +546,14 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="仓库库存" class-name="colorheader7">
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_count?scope.row.data.六车间生产入库_count:0 - scope.row.data.销售发货_count?scope.row.data.销售发货_count:0 }}</span>
</template>
</el-table-column>
<el-table-column label="领管-终检合格率"> <el-table-column label="领管-终检合格率">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.data&&(scope.row.data.七车间_批次发货合格率||scope.row.data.七车间_批次发货合格率==0)">{{ scope.row.data.七车间_批次发货合格率 }}%</span> <span v-if="scope.row.data&&(scope.row.data.七车间_批次发货合格率||scope.row.data.七车间_批次发货合格率==0)">{{ (((scope.row.data.销售发货_count+scope.row.data.六车间库存_count)/(scope.row.data.六车间领料_count+scope.row.data.六车间交接领料_count))*100).toFixed(2) }}%</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组合件批次号" min-width="160"> <el-table-column label="组合件批次号" min-width="160">
@ -671,6 +721,14 @@ export default {
count_qt = data.管料退火_count_notok - count; count_qt = data.管料退火_count_notok - count;
return count_qt; return count_qt;
} }
}else if(type=='工前检验'){
if(data.六车间_工前检验_count_notok){
if (data.六车间_工前检验_count_n_dl !== undefined) {
count += data.六车间_工前检验_count_n_dl ;
}
count_qt = data.六车间_工前检验_count_notok - count;
return count_qt;
}
}else if(type=='开槽'){ }else if(type=='开槽'){
if(data.六车间_开槽_count_notok){ if(data.六车间_开槽_count_notok){
if (data.六车间_开槽_count_n_dl !== undefined) { if (data.六车间_开槽_count_n_dl !== undefined) {

15
src/views/wpm_bx/handover_form2.vue
View File

@ -59,6 +59,9 @@
<span>{{ item2.number }}</span> <span>{{ item2.number }}</span>
<el-icon class="circleCloseFilled" @click="deleteWpr($index,index2,item2.wpr)"><el-icon-circleClose-filled /></el-icon> <el-icon class="circleCloseFilled" @click="deleteWpr($index,index2,item2.wpr)"><el-icon-circleClose-filled /></el-icon>
</div> </div>
<div v-for="item3 in diff" :key="item3" class="wprItem disabledItem">
<span>{{ item3 }}</span>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
@ -229,8 +232,11 @@ export default {
}) })
//如果arrs里有不是这个批次的wpr,提示错误 //如果arrs里有不是这个批次的wpr,提示错误
let diff = arrs.filter(item => !barchArrs.includes(item)); let diff = arrs.filter(item => !barchArrs.includes(item));
that.diff = diff;
console.log('diff',diff)
if(diff.length>0){ if(diff.length>0){
that.$confirm("物料"+diff.join(",")+"不在该批次中", "提示", {type: "warning",}).then(() => {}); that.$message.warning("物料"+diff.join(",")+"不在该批次中");
// that.$confirm("物料"+diff.join(",")+"不在该批次中", "提示", {type: "warning",}).then(() => {});
} }
}else{ }else{
//放入对应的行中的handoverb中，并且在列表中disabled //放入对应的行中的handoverb中，并且在列表中disabled
@ -251,7 +257,8 @@ export default {
} }
}) })
} }
this.$refs.codeInput.focus(); console.log('this.$refs.codeInput',this.$refs.codeInput)
this.$refs.codeInput[index].focus();
}, },
deleteWpr(index1,index2,wpr){ deleteWpr(index1,index2,wpr){
let that = this; let that = this;
@ -356,6 +363,10 @@ export default {
margin-right: 20px; margin-right: 20px;
margin-top: 5px; margin-top: 5px;
} }
.disabledItem{
color: #fff;
background: #f56c6c;
}
.circleCloseFilled{ .circleCloseFilled{
position: absolute; position: absolute;
top: -7px; top: -7px;

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

@ -136,8 +136,27 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="班次"></el-table-column> <el-table-column label="班次">
<el-table-column label="创建时间"></el-table-column> <template #default="scope">
<el-select
v-if="scope.row.isEdit"
v-model="scope.row.shift"
placeholder="班次"
class="width-100"
>
<el-option
v-for="item in shiftOtions"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
<div v-else>
<span v-if="scope.row.shift_name!==null">{{ scope.row.shift_name}}</span>
</div>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="150px"> <el-table-column label="操作" fixed="right" align="center" width="150px">
<template #default="scope"> <template #default="scope">
<el-button v-if="scope.row.isEdit" type="success" @click="saveMuserSubmit(scope.row)">保存</el-button> <el-button v-if="scope.row.isEdit" type="success" @click="saveMuserSubmit(scope.row)">保存</el-button>
@ -516,6 +535,7 @@ export default {
printer_name:localStorage.getItem("printer_name"), printer_name:localStorage.getItem("printer_name"),
addTemplate:{ addTemplate:{
mlog: "", mlog: "",
shift:"",
process: "", process: "",
equipment: "", equipment: "",
handle_user: "", handle_user: "",