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

yemianduobankuaiyangshixiugai

This commit is contained in:
shijing 2022-03-31 11:18:29 +08:00
parent 5d21c4e72e
commit e9cdb49787
4 changed files with 260 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hb_client/src/views/em/equipment.vue
View File

@ -47,21 +47,21 @@
v-el-height-adaptive-table="{bottomOffset: 42}" v-el-height-adaptive-table="{bottomOffset: 42}"
> >
<el-table-column type="index" width="50"/> <el-table-column type="index" width="50"/>
<el-table-column label="设备名称" prop="name" width="120" show-overflow-tooltip> <el-table-column label="设备名称" prop="name" min-width="120" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="设备编号" prop="number" width="120"> <el-table-column label="设备编号" prop="number" min-width="120">
</el-table-column> </el-table-column>
<el-table-column label="型号规格" prop="model" width="120"> <el-table-column label="型号规格" prop="model" min-width="120">
</el-table-column> </el-table-column>
<el-table-column label="生产厂及国别" prop="factory" width="120" show-overflow-tooltip> <el-table-column label="生产厂及国别" prop="factory" min-width="120" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="生产日期" prop="production_date" width="120"> <el-table-column label="生产日期" prop="production_date" min-width="120">
</el-table-column> </el-table-column>
<el-table-column label="购置日期" prop="buy_date" width="120"> <el-table-column label="购置日期" prop="buy_date" min-width="120">
</el-table-column> </el-table-column>
<el-table-column label="数量" prop="count" width="120"> <el-table-column label="数量" prop="count" min-width="120">
</el-table-column> </el-table-column>
<el-table-column label="状态" width="120"> <el-table-column label="状态" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.state===10" type="success"> <el-tag v-if="scope.row.state===10" type="success">
{{ state_[scope.row.state] }} {{ state_[scope.row.state] }}
@ -77,16 +77,16 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="技术指标" width="120" show-overflow-tooltip> <el-table-column label="技术指标" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.parameter }}</template> <template slot-scope="scope">{{ scope.row.parameter }}</template>
</el-table-column> </el-table-column>
<el-table-column label="保管人" width="120"> <el-table-column label="保管人" min-width="120">
<template slot-scope="scope" v-if="scope.row.keeper_">{{ scope.row.keeper_.username }}</template> <template slot-scope="scope" v-if="scope.row.keeper_">{{ scope.row.keeper_.username }}</template>
</el-table-column> </el-table-column>
<el-table-column label="存放位置" width="120" show-overflow-tooltip> <el-table-column label="存放位置" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.place }}</template> <template slot-scope="scope">{{ scope.row.place }}</template>
</el-table-column> </el-table-column>
<el-table-column label="绑定工序" width="120" show-overflow-tooltip> <el-table-column label="绑定工序" min-width="160" show-overflow-tooltip>
<template slot-scope="scope" v-if="scope.row.step_"> <template slot-scope="scope" v-if="scope.row.step_">
<el-tag v-for="item in scope.row.step_" <el-tag v-for="item in scope.row.step_"
:key="item.number" :key="item.number"
@ -101,7 +101,7 @@
<el-table-column <el-table-column
align="center" align="center"
label="操作" label="操作"
width="120px" min-width="120px"
fixed="right" fixed="right"
> >
<template slot-scope="scope"> <template slot-scope="scope">

3
hb_client/src/views/wpm/firstCheck.vue
View File

@ -16,9 +16,10 @@
:data="subPlanList" :data="subPlanList"
fit fit
style="width: 100%" style="width: 100%"
height="100"
stripe stripe
border border
height="100"
highlight-current-row
v-el-height-adaptive-table="{bottomOffset: 50}" v-el-height-adaptive-table="{bottomOffset: 50}"
> >
<el-table-column type="index" width="50"/> <el-table-column type="index" width="50"/>

8
hb_client/src/views/wpm/productjy.vue
View File

@ -9,8 +9,9 @@
border border
fit fit
stripe stripe
height="100"
highlight-current-row highlight-current-row
max-height="600" v-el-height-adaptive-table="{bottomOffset: 60}"
> >
<el-table-column type="index" width="50"/> <el-table-column type="index" width="50"/>
<el-table-column label="成品名称"> <el-table-column label="成品名称">
@ -53,7 +54,6 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="wproductList.count > 0"
:total="wproductList.count" :total="wproductList.count"
:page.sync="listQuery.page" :page.sync="listQuery.page"
:limit.sync="listQuery.page_size" :limit.sync="listQuery.page_size"
@ -73,8 +73,9 @@
border border
fit fit
stripe stripe
height="100"
highlight-current-row highlight-current-row
max-height="600" v-el-height-adaptive-table="{bottomOffset: 60}"
> >
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" width="50"/> <el-table-column type="index" width="50"/>
@ -124,7 +125,6 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="wproductList1.count > 0"
:total="wproductList1.count" :total="wproductList1.count"
:page.sync="listQuery1.page" :page.sync="listQuery1.page"
:limit.sync="listQuery1.page_size" :limit.sync="listQuery1.page_size"

471
hb_client/src/views/wpm/worktask.vue
View File

@ -1,238 +1,242 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-tabs v-model="activeName" @tab-click="handleClick" type="border-card"> <el-card>
<el-tab-pane <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
v-for="item in processOption" <el-tab-pane
:key="item.name" v-for="item in processOption"
:label="item.name" :key="item.name"
:name="item.id" :label="item.name"
:closable="item.close" :name="item.id"
> :closable="item.close"
<el-table
:data="subproductionplanList.results"
border
stripe
style="width: 100%"
height="250"
highlight-current-row
@current-change="handleCurrentChange"
> >
<el-table-column type="index" width="50"/> <el-table
<el-table-column label="子计划编号" prop="number" min-width="100" show-overflow-tooltip> :data="subproductionplanList.results"
</el-table-column> border
<el-table-column label="产品名称" min-width="120" show-overflow-tooltip> stripe
<template slot-scope="scope"> style="width: 100%"
{{scope.row.plan_product_.name}} :height="tableHeight"
</template> highlight-current-row
</el-table-column> @current-change="handleCurrentChange"
<el-table-column label="产品型号">
<template slot-scope="scope">
{{scope.row.product_.specification}}
</template>
</el-table-column>
<el-table-column label="生产主产品" min-width="130" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.product_.name}}
</template>
</el-table-column>
<el-table-column label="名称" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.subproduction_.name}}
</template>
</el-table-column>
<el-table-column label="生产车间" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.workshop_.name}}
</template>
</el-table-column>
<el-table-column label="子工序" min-width="160">
<template slot-scope="scope" v-if="scope.row.steps">
<el-tag
v-for="item in scope.row.steps"
:key="item.number"
:label="item.name"
:value="item.number"
>
{{ item.name }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="开工时间" prop="start_date" width="100">
</el-table-column>
<el-table-column label="完工时间" prop="end_date" width="100">
</el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
{{ state_[scope.row.state] }}
</template>
</el-table-column>
<el-table-column label="领料状态" width="80">
<template slot-scope="scope">
<el-tag v-if="scope.row.is_picked == false">未领料</el-tag>
<el-tag v-else>已领料</el-tag>
</template>
</el-table-column>
<el-table-column label="计划/生产/合格">
<template slot-scope="scope">
{{ scope.row.count }}/{{ scope.row.count_real }}/{{scope.row.count_ok}}
</template>
</el-table-column>
<el-table-column
align="center"
label="操作"
width="80px"
fixed="right"
> >
<template slot-scope="scope"> <el-table-column type="index" width="50"/>
<el-link <el-table-column label="子计划编号" prop="number" min-width="100" show-overflow-tooltip>
v-if="checkPermission(['wmaterial_pick'])&&!scope.row.is_picked" </el-table-column>
type="success" <el-table-column label="产品名称" min-width="120" show-overflow-tooltip>
@click="handleNeed(scope)" <template slot-scope="scope">
> {{scope.row.plan_product_.name}}
领料 </template>
</el-link> </el-table-column>
<el-link <el-table-column label="产品型号">
v-if="checkPermission(['wmaterial_pick'])&&scope.row.is_picked" <template slot-scope="scope">
type="success" {{scope.row.product_.specification}}
@click="handleNeed(scope)" </template>
> </el-table-column>
继续领料 <el-table-column label="生产主产品" min-width="130" show-overflow-tooltip>
</el-link> <template slot-scope="scope">
<el-link {{scope.row.product_.name}}
v-if="checkPermission(['wmaterial_pick'])" </template>
type="primary" </el-table-column>
@click="handlepick(scope)" <el-table-column label="名称" min-width="100" show-overflow-tooltip>
> <template slot-scope="scope">
领半成品 {{scope.row.subproduction_.name}}
</el-link> </template>
</template> </el-table-column>
</el-table-column> <el-table-column label="生产车间" min-width="100" show-overflow-tooltip>
</el-table> <template slot-scope="scope">
<pagination {{scope.row.workshop_.name}}
v-show="subproductionplanList.count > 0" </template>
:total="subproductionplanList.count" </el-table-column>
:page.sync="listQuery.page" <el-table-column label="子工序" min-width="160">
:limit.sync="listQuery.page_size" <template slot-scope="scope" v-if="scope.row.steps">
@pagination="subproductionplanList" <el-tag
/> v-for="item in scope.row.steps"
<el-row :gutter="2"> :key="item.number"
<el-col :span="12"> :label="item.name"
<el-card class="box-card"> :value="item.number"
<div slot="header" class="clearfix">
<span>半成品</span>
</div>
<el-button
v-for="item in steps"
v-show="checkPermission(['wmaterial_operation'])"
:key="item.number"
type="primary"
style="margin-left: 2px"
:label="item.name"
:value="item.number"
@click="handlework(item)"
>
{{ item.name }}
</el-button>
<el-button
v-show="checkPermission(['wp_scrap'])&&activeName==1"
id="scrap"
type="primary"
style="float: right;"
@click="handleScrapbcp()"
>
报废
</el-button>
<el-badge :value="count" class="item" style="float:right">
<el-button
type="primary"
@click="handleAll()"
> >
显示全部 {{ item.name }}
</el-button> </el-tag>
</el-badge> </template>
<el-table </el-table-column>
border <el-table-column label="开工时间" prop="start_date" width="100">
fit </el-table-column>
stripe <el-table-column label="完工时间" prop="end_date" width="100">
style="width: 100%" </el-table-column>
max-height="300" <el-table-column label="状态">
:data="wproductData" <template slot-scope="scope">
@selection-change="handleSelectionChange" {{ state_[scope.row.state] }}
</template>
</el-table-column>
<el-table-column label="领料状态" width="80">
<template slot-scope="scope">
<el-tag v-if="scope.row.is_picked == false">未领料</el-tag>
<el-tag v-else>已领料</el-tag>
</template>
</el-table-column>
<el-table-column label="计划/生产/合格">
<template slot-scope="scope">
{{ scope.row.count }}/{{ scope.row.count_real }}/{{scope.row.count_ok}}
</template>
</el-table-column>
<el-table-column
align="center"
label="操作"
width="80px"
fixed="right"
>
<template slot-scope="scope">
<el-link
v-if="checkPermission(['wmaterial_pick'])&&!scope.row.is_picked"
type="success"
@click="handleNeed(scope)"
>
领料
</el-link>
<el-link
v-if="checkPermission(['wmaterial_pick'])&&scope.row.is_picked"
type="success"
@click="handleNeed(scope)"
>
继续领料
</el-link>
<el-link
v-if="checkPermission(['wmaterial_pick'])"
type="primary"
@click="handlepick(scope)"
>
领半成品
</el-link>
</template>
</el-table-column>
</el-table>
<pagination
v-show="subproductionplanList.count > 0"
:total="subproductionplanList.count"
:page.sync="listQuery.page"
:limit.sync="listQuery.page_size"
@pagination="subproductionplanList"
/>
</el-tab-pane>
</el-tabs>
</el-card>
<el-card>
<el-row :gutter="2">
<el-col :span="12">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>半成品</span>
</div>
<el-button
v-for="item in steps"
v-show="checkPermission(['wmaterial_operation'])"
:key="item.number"
type="primary"
style="margin-left: 2px"
:label="item.name"
:value="item.number"
@click="handlework(item)"
>
{{ item.name }}
</el-button>
<el-button
v-show="checkPermission(['wp_scrap'])&&activeName==1"
id="scrap"
type="primary"
style="float: right;"
@click="handleScrapbcp()"
>
报废
</el-button>
<el-badge :value="count" class="item" style="float:right">
<el-button
type="primary"
@click="handleAll()"
> >
<el-table-column type="selection" width="40"></el-table-column> 显示全部
<el-table-column type="index" width="50"/> </el-button>
<el-table-column label="子计划编号" width="100" show-overflow-tooltip> </el-badge>
<template slot-scope="scope">{{ scope.row.number }}</template>> <el-table
<template slot-scope="scope"> border
{{scope.row.subproduction_plan_.number}} fit
</template> stripe
</el-table-column> style="width: 100%"
<el-table-column label="玻璃编号" prop="number" width="100" show-overflow-tooltip> :height="secondTableHeight"
</el-table-column> :data="wproductData"
<el-table-column label="玻璃状态" width="100" show-overflow-tooltip> @selection-change="handleSelectionChange"
<template slot-scope="scope"> >
{{scope.row.material_.name}} <el-table-column type="selection" width="40"></el-table-column>
</template> <el-table-column type="index" width="50"/>
</el-table-column> <el-table-column label="子计划编号" min-width="100" show-overflow-tooltip>
<el-table-column label="所在子工序" width="100" show-overflow-tooltip> <template slot-scope="scope">{{ scope.row.number }}</template>>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.step_.name}} {{scope.row.subproduction_plan_.number}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="进行状态" width="100" show-overflow-tooltip> <el-table-column label="玻璃编号" prop="number" min-width="100" show-overflow-tooltip>
<template slot-scope="scope"> </el-table-column>
{{actstate_[scope.row.act_state]}} <el-table-column label="玻璃状态" min-width="100" show-overflow-tooltip>
</template> <template slot-scope="scope">
</el-table-column> {{scope.row.material_.name}}
<el-table-column label="不合格标记" width="100"> </template>
<template slot-scope="scope"> </el-table-column>
{{ ng_sign_[scope.row.ng_sign] }} <el-table-column label="所在子工序" min-width="100" show-overflow-tooltip>
</template> <template slot-scope="scope">
</el-table-column> {{scope.row.step_.name}}
<el-table-column label="更新时间" prop="update_time" width="160"> </template>
</el-table-column> </el-table-column>
</el-table> <el-table-column label="进行状态" min-width="100" show-overflow-tooltip>
</el-card> <template slot-scope="scope">
</el-col> {{actstate_[scope.row.act_state]}}
<el-col :span="12"> </template>
<el-card class="box-card"> </el-table-column>
<div slot="header" class="clearfix"> <el-table-column label="不合格标记" min-width="100">
<span>车间物料</span> <template slot-scope="scope">
</div> {{ ng_sign_[scope.row.ng_sign] }}
<el-table </template>
:data="wmaterialList" </el-table-column>
border <el-table-column label="更新时间" prop="update_time" min-width="160">
fit </el-table-column>
stripe </el-table>
style="width: 100%" </el-card>
max-height="300" </el-col>
> <el-col :span="12">
<el-table-column type="index" width="50"/> <el-card class="box-card">
<el-table-column label="子计划编号" min-width="100" show-overflow-tooltip> <div slot="header" class="clearfix">
<template slot-scope="scope"> <span>车间物料</span>
{{scope.row.subproduction_plan_.number }} </div>
</template> <el-table
</el-table-column> :data="wmaterialList"
<el-table-column label="物料名称" min-width="130" show-overflow-tooltip> border
<template slot-scope="scope"> fit
{{scope.row.material_.name}} stripe
</template> style="width: 100%"
</el-table-column> :height="tableHeight"
<el-table-column label="物料单位"> >
<template slot-scope="scope"> <el-table-column type="index" width="50"/>
{{scope.row.material_.unit}} <el-table-column label="子计划编号" min-width="100" show-overflow-tooltip>
</template> <template slot-scope="scope">
</el-table-column> {{scope.row.subproduction_plan_.number }}
<el-table-column prop="batch" label="物料批次"> </template>
</el-table-column> </el-table-column>
<el-table-column prop="count" label="物料数量"> <el-table-column label="物料名称" min-width="130" show-overflow-tooltip>
</el-table-column> <template slot-scope="scope">
</el-table> {{scope.row.material_.name}}
</el-card> </template>
</el-col> </el-table-column>
</el-row> <el-table-column label="物料单位">
</el-tab-pane> <template slot-scope="scope">
</el-tabs> {{scope.row.material_.unit}}
</template>
</el-table-column>
<el-table-column prop="batch" label="物料批次">
</el-table-column>
<el-table-column prop="count" label="物料数量">
</el-table-column>
</el-table>
</el-card>
</el-col>
</el-row>
</el-card>
<el-dialog <el-dialog
title="半成品报废" title="半成品报废"
:close-on-click-modal="false" :close-on-click-modal="false"
@ -781,7 +785,6 @@
4: "已完成", 4: "已完成",
}, },
listLoading: true, listLoading: true,
listLoading: true,
id: "", id: "",
dialogTableVisible: false, dialogTableVisible: false,
dialogVisible: false, dialogVisible: false,
@ -828,6 +831,8 @@
{lable: "其他", value: 40}, {lable: "其他", value: 40},
], ],
count: null, count: null,
tableHeight: null,
secondTableHeight: null,
}; };
}, },
process: "", process: "",
@ -1187,5 +1192,11 @@
}); });
}, },
}, },
mounted() {
let H = document.getElementsByClassName('app-main')[0].clientHeight;
let h = H/2-85;
this.tableHeight = h+'px';
this.secondTableHeight = h-36+'px';
}
}; };
</script> </script>