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

xiugaiyangshi

This commit is contained in:
shilixia 2021-11-24 16:11:14 +08:00
parent 2ed882f611
commit 4dfdd09a3c
14 changed files with 487 additions and 458 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hb_client/src/views/inm/fifo.vue
View File

@ -37,7 +37,9 @@
fit fit
stripe stripe
highlight-current-row highlight-current-row
max-height="600" max-height="700"
height="100"
v-el-height-adaptive-table="{bottomOffset: 50}"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="出入记录ID"> <el-table-column label="出入记录ID">

4
hb_client/src/views/inm/materialbatch.vue
View File

@ -33,7 +33,9 @@
fit fit
stripe stripe
highlight-current-row highlight-current-row
max-height="600" max-height="700"
height="100"
v-el-height-adaptive-table="{bottomOffset: 50}"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="物料批次"> <el-table-column label="物料批次">

4
hb_client/src/views/inm/warehouse.vue
View File

@ -37,7 +37,9 @@
fit fit
stripe stripe
highlight-current-row highlight-current-row
max-height="600" max-height="700"
height="100"
v-el-height-adaptive-table="{bottomOffset: 50}"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="仓库名称"> <el-table-column label="仓库名称">

4
hb_client/src/views/inm/wproduct.vue
View File

@ -9,7 +9,9 @@
fit fit
stripe stripe
highlight-current-row highlight-current-row
max-height="600" max-height="700"
height="100"
v-el-height-adaptive-table="{bottomOffset: 50}"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="半成品编号"> <el-table-column label="半成品编号">

4
hb_client/src/views/mtm/material.vue
View File

@ -37,9 +37,9 @@
fit fit
stripe stripe
highlight-current-row highlight-current-row
max-height="600" max-height="620"
height="100" height="100"
v-el-height-adaptive-table="{bottomOffset: 50}" v-el-height-adaptive-table="{bottomOffset: 10}"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="物料编号"> <el-table-column label="物料编号">

9
hb_client/src/views/mtm/materialdo.vue
View File

@ -20,13 +20,14 @@
</el-button> </el-button>
<!--表格列表--> <!--表格列表-->
<el-table <el-table
v-el-height-adaptive-table="{ bottomOffset: 50 }"
:data="recordformList.results" :data="recordformList.results"
border border
fit fit
stripe stripe
highlight-current-row highlight-current-row
height="100" height="670"
v-el-height-adaptive-table="{ bottomOffset: 20 }"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column type="index" width="50"/> <el-table-column type="index" width="50"/>
@ -234,8 +235,8 @@
fit fit
stripe stripe
highlight-current-row highlight-current-row
height="100" height="670"
v-el-height-adaptive-table="{ bottomOffset: 50 }" v-el-height-adaptive-table="{ bottomOffset: 20 }"
> >
<el-table-column type="index" width="50"/> <el-table-column type="index" width="50"/>
<el-table-column label="字段名称"> <el-table-column label="字段名称">

6
hb_client/src/views/mtm/process.vue
View File

@ -15,9 +15,9 @@
border border
fit fit
stripe stripe
highlight-current-row max-height="620"
height="100" height="100"
v-el-height-adaptive-table="{bottomOffset: 50}" v-el-height-adaptive-table="{bottomOffset: 10}"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="工序编号"> <el-table-column label="工序编号">

2
hb_client/src/views/pm/plan.vue
View File

@ -13,6 +13,7 @@
stripe stripe
style="width: 100%" style="width: 100%"
height="300" height="300"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
@ -99,6 +100,7 @@
style="width: 100%" style="width: 100%"
height="250" height="250"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />

14
hb_client/src/views/procurement/vendor.vue
View File

@ -2,6 +2,10 @@
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增供应商</el-button >
<el-input <el-input
v-model="listQuery.search" v-model="listQuery.search"
placeholder="供应商名称" placeholder="供应商名称"
@ -24,11 +28,7 @@
>重置</el-button >重置</el-button
> >
</div> </div>
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增供应商</el-button
>
</div>
</el-card> </el-card>
<el-card style="margin-top: 2px"> <el-card style="margin-top: 2px">
<el-table <el-table
@ -38,7 +38,9 @@
fit fit
stripe stripe
highlight-current-row highlight-current-row
max-height="600" max-height="700"
height="100"
v-el-height-adaptive-table="{bottomOffset: 50}"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="供应商名"> <el-table-column label="供应商名">

8
hb_client/src/views/qm/standard.vue
View File

@ -2,6 +2,8 @@
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增标准</el-button >
<el-input <el-input
v-model="listQuery.search" v-model="listQuery.search"
placeholder="标准名称" placeholder="标准名称"
@ -24,11 +26,7 @@
>重置</el-button >重置</el-button
> >
</div> </div>
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增标准</el-button
>
</div>
</el-card> </el-card>
<el-card style="margin-top: 2px"> <el-card style="margin-top: 2px">
<el-table <el-table

9
hb_client/src/views/qm/testitem.vue
View File

@ -2,6 +2,9 @@
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增项目</el-button
>
<el-input <el-input
v-model="listQuery.search" v-model="listQuery.search"
placeholder="项目名称" placeholder="项目名称"
@ -24,11 +27,7 @@
>重置</el-button >重置</el-button
> >
</div> </div>
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增项目</el-button
>
</div>
</el-card> </el-card>
<el-card style="margin-top: 2px"> <el-card style="margin-top: 2px">
<el-table <el-table

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

@ -1,9 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix">
<span>操作记录表</span>
</div>
<el-table <el-table
:data="operationList.results" :data="operationList.results"
@ -11,7 +9,9 @@
fit fit
stripe stripe
style="width: 100%" style="width: 100%"
max-height="700" max-height="670"
highlight-current-row
v-el-height-adaptive-table="{bottomOffset: 50}"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />

828
hb_client/src/views/wpm/operationdo.vue
View File

@ -1,288 +1,403 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card > <el-card>
<el-card > <el-card>
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>基本信息</span> <span>基本信息</span>
</div> </div>
<el-form <el-form
ref="form" ref="form"
inline="true" inline="true"
:model="operationData" :model="operationData"
label-width="80px" label-width="80px"
> >
<el-form-item label="子工序"> <el-form-item label="子工序">
<el-input <el-input
v-model="operationData.step_.name" v-model="operationData.step_.name"
disabled="disabled" disabled="disabled"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建人"> <el-form-item label="创建人">
<el-input <el-input
v-model="operationData.create_by_.username" v-model="operationData.create_by_.username"
disabled="disabled" disabled="disabled"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-input <el-input
v-model="operationData.create_time" v-model="operationData.create_time"
disabled="disabled" disabled="disabled"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="边角料"> <el-form-item label="边角料">
<el-radio-group v-model="operationData.use_scrap"> <el-radio-group v-model="operationData.use_scrap">
<el-radio <el-radio border
:label="item.value" :label="item.value"
:key="item.value" :key="item.value"
v-for="item in scrap" v-for="item in scrap"
>{{ item.lable }}</el-radio >{{ item.lable }}</el-radio
> >
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="备注" v-if="operationData.use_scrap"> <el-form-item label="备注" v-if="operationData.use_scrap">
<el-input type="textarea" v-model="operationData.remark"></el-input> <el-input type="textarea" v-model="operationData.remark"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="operationData.use_scrap"> <el-form-item v-if="operationData.use_scrap">
<el-button type="primary" @click="scrapSubmit()">创建</el-button> <el-button type="primary" @click="scrapSubmit()">创建</el-button>
<el-button>取消</el-button> <el-button>取消</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<el-row gutter="2"> <el-row gutter="2">
<el-col span="8"> <el-col span="8">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>半成品</span> <span>半成品</span>
</div> </div>
<template> <template>
<el-table
<el-table :data="operationwpData" border :data="operationwpData"
fit border
stripe highlight-current-row fit
height="230" style="width: 100%" > stripe
highlight-current-row
height="230"
style="width: 100%"
>
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column prop="subproduction_plan_.number" label="子计划编号"> <el-table-column
</el-table-column> prop="subproduction_plan_.number"
<el-table-column prop="number" label="半成品编号"> label="子计划编号"
</el-table-column> >
<el-table-column prop="material_.name" label="半成品名称"> </el-table-column>
</el-table-column> <el-table-column prop="number" label="半成品编号">
</el-table-column>
<el-table-column prop="material_.name" label="半成品名称">
</el-table-column>
<el-table-column align="center" label="操作" width="100px"> <el-table-column align="center" label="操作" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link <el-link
v-if="checkPermission(['warehouse_update'])" v-if="checkPermission(['warehouse_update'])"
@click="handleDeletewproduct(scope)" @click="handleDeletewproduct(scope)"
>删除</el-link >删除</el-link
>
</template>
</el-table-column>
</el-table>
</template>
</el-card>
</el-col>
<el-col span="8" >
<el-card class="box-card" >
<div slot="header" class="clearfix">
<span>设备</span>
</div>
<template>
<el-table :data="equData" border
fit
stripe highlight-current-row
height="230" style="width: 100%" >
<el-table-column prop="equip_.number" label="设备编号">
</el-table-column>
<el-table-column prop="equip_.name" label="设备名称">
</el-table-column>
<el-table-column align="center" label="操作" width="100px">
<template slot-scope="scope">
<el-link
v-if="checkPermission(['warehouse_update'])"
@click="handleDeletequip(scope)"
>删除</el-link
>
</template>
</el-table-column>
</el-table>
</template>
</el-card>
</el-col>
<el-col span="8">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>自定义表格</span>
</div>
<template>
<el-table :data="recordData" border
fit
stripe highlight-current-row
height="230" style="width: 100%">
<el-table-column prop="form_.name" label="表名">
</el-table-column>
<el-table-column label="是否填写">
<template slot-scope="scope">
<el-tag v-if="scope.row.is_filled == false">未填写</el-tag>
<el-tag v-else>已填写</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="100px">
<template slot-scope="scope">
<el-link
v-if="checkPermission(['warehouse_update'])"
@click="handlerecord(scope)"
>填写表单</el-link
>
</template>
</el-table-column>
</el-table>
<el-dialog
:model="tableForm"
:visible.sync="dialogVisibleForm"
:title="tableForm.name"
>
<el-form label-width="80px" label-position="right">
<el-row v-for="(item, $index) in fieldList" :key="$index">
<el-form-item
v-if="item.field_type === 'string'"
:label="item.field_name"
>
<el-input placeholder="请输入" v-model="item.sort" />
</el-form-item>
<el-form-item
v-else-if="item.field_type === 'int'"
:label="item.field_name"
>
<el-input
type="number"
placeholder="请输入"
v-model="item.sort"
/>
</el-form-item>
<el-form-item
v-else-if="item.field_type === 'float'"
:label="item.field_name"
>
<el-input
type="number"
placeholder="请输入"
v-model="item.sort"
/>
</el-form-item>
<el-form-item
v-else-if="item.field_type === 'date'"
:label="item.field_name"
>
<el-date-picker
v-model="item.create_time"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
style="width: 100%"
> >
</el-date-picker> </template>
</el-form-item> </el-table-column>
<el-form-item </el-table>
v-else-if="item.field_type === 'datetime'" </template>
:label="item.field_name" </el-card>
> </el-col>
<el-date-picker <el-col span="8">
v-model="item.create_time" <el-card class="box-card">
type="datetime" <div slot="header" class="clearfix">
placeholder="选择日期" <span>设备</span>
value-format="yyyy-MM-dd HH:mm:ss" </div>
style="width: 100%" <template>
<el-table
:data="equData"
border
fit
stripe
highlight-current-row
height="230"
style="width: 100%"
>
<el-table-column prop="equip_.number" label="设备编号">
</el-table-column>
<el-table-column prop="equip_.name" label="设备名称">
</el-table-column>
<el-table-column align="center" label="操作" width="100px">
<template slot-scope="scope">
<el-link
v-if="checkPermission(['warehouse_update'])"
@click="handleDeletequip(scope)"
>删除</el-link
> >
</el-date-picker> </template>
</el-form-item> </el-table-column>
<el-form-item </el-table>
v-else-if="item.field_type === 'select'" </template>
:label="item.field_name" </el-card>
> </el-col>
<el-select <el-col span="8">
style="width: 100%" <el-card class="box-card">
v-model="item.sort" <div slot="header" class="clearfix">
placeholder="请选择" <span>自定义表格</span>
</div>
<template>
<el-table
:data="recordData"
border
fit
stripe
highlight-current-row
height="230"
style="width: 100%"
>
<el-table-column prop="form_.name" label="表名">
</el-table-column>
<el-table-column label="是否填写">
<template slot-scope="scope">
<el-tag v-if="scope.row.is_filled == false">未填写</el-tag>
<el-tag v-else>已填写</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="100px">
<template slot-scope="scope">
<el-link
v-if="checkPermission(['warehouse_update'])"
@click="handlerecord(scope)"
>填写表单</el-link
> >
<el-option </template>
v-for="item1 in item.field_choice" </el-table-column>
:key="item1" </el-table>
:label="item1" <el-dialog
:value="item1" :model="tableForm"
:visible.sync="dialogVisibleForm"
:title="tableForm.name"
>
<el-form label-width="80px" label-position="right">
<el-row v-for="(item, $index) in fieldList" :key="$index">
<el-form-item
v-if="item.field_type === 'string'"
:label="item.field_name"
>
<el-input placeholder="请输入" v-model="item.sort" />
</el-form-item>
<el-form-item
v-else-if="item.field_type === 'int'"
:label="item.field_name"
>
<el-input
type="number"
placeholder="请输入"
v-model="item.sort"
/>
</el-form-item>
<el-form-item
v-else-if="item.field_type === 'float'"
:label="item.field_name"
>
<el-input
type="number"
placeholder="请输入"
v-model="item.sort"
/>
</el-form-item>
<el-form-item
v-else-if="item.field_type === 'date'"
:label="item.field_name"
>
<el-date-picker
v-model="item.create_time"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
style="width: 100%"
> >
</el-option> </el-date-picker>
</el-select> </el-form-item>
</el-form-item> <el-form-item
<el-form-item v-else-if="item.field_type === 'datetime'"
v-else-if="item.field_type === 'selects'" :label="item.field_name"
:label="item.field_name"
>
<el-select
style="width: 100%"
v-model="optio"
multiple
placeholder="请选择"
> >
<el-option <el-date-picker
v-for="item1 in item.field_choice" v-model="item.create_time"
:key="item1" type="datetime"
:label="item1" placeholder="选择日期"
:value="item1" value-format="yyyy-MM-dd HH:mm:ss"
style="width: 100%"
> >
</el-option> </el-date-picker>
</el-select> </el-form-item>
</el-form-item> <el-form-item
</el-row> v-else-if="item.field_type === 'select'"
</el-form> :label="item.field_name"
<span slot="footer"> >
<el-button type="danger" @click="dialogVisibleForm = false" <el-select
>取消</el-button style="width: 100%"
v-model="item.sort"
placeholder="请选择"
>
<el-option
v-for="item1 in item.field_choice"
:key="item1"
:label="item1"
:value="item1"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item
v-else-if="item.field_type === 'selects'"
:label="item.field_name"
>
<el-select
style="width: 100%"
v-model="optio"
multiple
placeholder="请选择"
>
<el-option
v-for="item1 in item.field_choice"
:key="item1"
:label="item1"
:value="item1"
>
</el-option>
</el-select>
</el-form-item>
</el-row>
</el-form>
<span slot="footer">
<el-button type="danger" @click="dialogVisibleForm = false"
>取消</el-button
>
<el-button type="primary" @click="recordconfirm()"
>提交</el-button
>
</span>
</el-dialog>
</template>
</el-card>
</el-col>
</el-row>
<el-row gutter="2">
<el-col span="8">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>消耗物料</span>
<el-button
style="float: right; padding: 3px 0"
type="text"
@click="cjllclick()"
>从车间领料</el-button
>
</div>
<template>
<el-table
:data="inputData"
border
fit
stripe
highlight-current-row
height="230"
style="width: 100%"
>
<el-table-column
prop="subproduction_plan_.number"
label="子计划编号"
> >
<el-button type="primary" @click="recordconfirm()" </el-table-column>
>提交</el-button <el-table-column prop="batch" label="物料批次">
</el-table-column>
<el-table-column prop="material_.name" label="物料名称">
</el-table-column>
<el-table-column prop="material_.unit" label="物料单位">
</el-table-column>
<el-table-column prop="count" label="消耗数量">
</el-table-column>
</el-table>
<el-dialog title="车间物料" :visible.sync="dialogTablepick">
<el-table
:data="wmaterialData"
border
fit
stripe
style="width: 100%"
max-height="400"
> >
</span> <el-table-column type="index" width="50" />
</el-dialog>
</template> <el-table-column label="物料名称">
</el-card> <template slot-scope="scope">{{
</el-col> scope.row.material_.name
</el-row> }}</template>
<el-row gutter="2"> </el-table-column>
<el-col span="8"> <el-table-column label="物料单位">
<el-card class="box-card"> <template slot-scope="scope">{{
<div slot="header" class="clearfix"> scope.row.material_.unit
<span>消耗物料</span> }}</template>
<el-button </el-table-column>
style="float: right; padding: 3px 0" <el-table-column label="物料批次">
type="text" <template slot-scope="scope">{{
@click="cjllclick()" scope.row.batch
>从车间领料</el-button }}</template>
</el-table-column>
<el-table-column label="车间物料数量">
<template slot-scope="scope">{{
scope.row.count
}}</template>
</el-table-column>
<el-table-column label="实际使用数量" width="140px">
<template slot-scope="scope">
<el-form :model="scope.row" widht="100px">
<el-form-item size="mini">
<el-input-number
v-model="scope.row.pick_count"
:min="0"
:controls="false"
:value="0"
></el-input-number>
</el-form-item>
</el-form>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="100px">
<template slot-scope="scope">
<el-link
v-if="checkPermission(['warehouse_update'])"
@click="handlepick(scope)"
>提交</el-link
>
</template>
</el-table-column>
</el-table>
</el-dialog>
</template>
</el-card>
</el-col>
<el-col span="8">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>产出物料</span>
<el-button
style="float: right; padding: 3px 0"
type="text"
@click="dialogTableoutput = true"
>选择产出</el-button
>
</div>
<el-table
:data="outputData"
border
fit
stripe
highlight-current-row
height="230"
style="width: 100%"
> >
</div>
<template>
<el-table :data="inputData" border
fit
stripe highlight-current-row
height="230" style="width: 100%">
<el-table-column <el-table-column
prop="subproduction_plan_.number" prop="subproduction_plan_.number"
label="子计划编号" label="子计划编号"
> >
</el-table-column> </el-table-column>
<el-table-column prop="batch" label="物料批次"> </el-table-column>
<el-table-column prop="material_.name" label="物料名称"> <el-table-column prop="material_.name" label="物料名称">
</el-table-column> </el-table-column>
<el-table-column prop="material_.unit" label="物料单位"> <el-table-column prop="material_.unit" label="物料单位">
</el-table-column> </el-table-column>
<el-table-column prop="count" label="消耗数量"> </el-table-column> <el-table-column prop="count" label="产出数量"> </el-table-column>
</el-table> </el-table>
<el-dialog title="车间物料" :visible.sync="dialogTablepick"> <el-dialog title="产出物料" :visible.sync="dialogTableoutput">
<el-table <el-table
:data="wmaterialData" :data="tprogressData"
border border
fit fit
stripe stripe
@ -291,6 +406,11 @@
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="生产计划编号">
<template slot-scope="scope">{{
scope.row.subproduction_plan
}}</template>
</el-table-column>
<el-table-column label="物料名称"> <el-table-column label="物料名称">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.material_.name scope.row.material_.name
@ -301,18 +421,16 @@
scope.row.material_.unit scope.row.material_.unit
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column label="物料批次"> <el-table-column label="应产数量">
<template slot-scope="scope">{{ scope.row.batch }}</template>
</el-table-column>
<el-table-column label="车间物料数量">
<template slot-scope="scope">{{ scope.row.count }}</template> <template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column> </el-table-column>
<el-table-column label="实际使用数量" width="140px">
<el-table-column label="本操作产出数量" width="140px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form :model="scope.row" widht="100px"> <el-form :model="scope.row" widht="100px">
<el-form-item size="mini"> <el-form-item size="mini">
<el-input-number <el-input-number
v-model="scope.row.pick_count" v-model="scope.row.output_count"
:min="0" :min="0"
:controls="false" :controls="false"
:value="0" :value="0"
@ -325,126 +443,35 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-link <el-link
v-if="checkPermission(['warehouse_update'])" v-if="checkPermission(['warehouse_update'])"
@click="handlepick(scope)" @click="handleoutput(scope)"
>提交</el-link >提交</el-link
> >
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-dialog> </el-dialog>
</template> </el-card>
</el-card> </el-col>
</el-col> <el-col span="8">
<el-col span="8"> <el-card class="box-card">
<el-card class="box-card"> <div slot="header" class="clearfix">
<div slot="header" class="clearfix"> <span>工序工装</span>
<span>产出物料</span> </div>
<el-button </el-card>
style="float: right; padding: 3px 0" </el-col>
type="text" </el-row>
@click="dialogTableoutput = true" <el-card>
>选择产出</el-button <el-button type="primary" style="float: right" @click="handlesubmit()"
> >提交本次操作</el-button
</div> >
<el-table :data="outputData" border </el-card>
fit </el-card>
stripe highlight-current-row
height="230" style="width: 100%">
<el-table-column
prop="subproduction_plan_.number"
label="子计划编号"
>
</el-table-column>
<el-table-column prop="material_.name" label="物料名称">
</el-table-column>
<el-table-column prop="material_.unit" label="物料单位">
</el-table-column>
<el-table-column prop="count" label="产出数量"> </el-table-column>
</el-table>
<el-dialog title="产出物料" :visible.sync="dialogTableoutput">
<el-table
:data="tprogressData"
border
fit
stripe
style="width: 100%"
max-height="400"
>
<el-table-column type="index" width="50" />
<el-table-column label="生产计划编号">
<template slot-scope="scope">{{
scope.row.subproduction_plan
}}</template>
</el-table-column>
<el-table-column label="物料名称">
<template slot-scope="scope">{{
scope.row.material_.name
}}</template>
</el-table-column>
<el-table-column label="物料单位">
<template slot-scope="scope">{{
scope.row.material_.unit
}}</template>
</el-table-column>
<el-table-column label="应产数量">
<template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
<el-table-column label="本操作产出数量" width="140px">
<template slot-scope="scope">
<el-form :model="scope.row" widht="100px">
<el-form-item size="mini">
<el-input-number
v-model="scope.row.output_count"
:min="0"
:controls="false"
:value="0"
></el-input-number>
</el-form-item>
</el-form>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="100px">
<template slot-scope="scope">
<el-link
v-if="checkPermission(['warehouse_update'])"
@click="handleoutput(scope)"
>提交</el-link
>
</template>
</el-table-column>
</el-table>
</el-dialog>
</el-card>
</el-col>
<el-col span="8" >
<el-card class="box-card" >
<div slot="header" class="clearfix">
<span>工序工装</span>
</div>
</el-card>
</el-col>
</el-row>
<el-button type="primary"
@click="handlesubmit()"
>提交本次操作</el-button
>
</el-card>
</div> </div>
</template> </template>
<style scoped> <style scoped>
.box-card { .box-card {
height: 300px; height: 300px;
} }
</style> </style>
</style> </style>
<script> <script>
@ -464,7 +491,7 @@ import {
deleteOperationequip, deleteOperationequip,
deleteOperationwproduct, deleteOperationwproduct,
gettoolList, gettoolList,
createTool createTool,
} from "@/api/wpm"; } from "@/api/wpm";
import { getrffieldList } from "@/api/mtm"; import { getrffieldList } from "@/api/mtm";
@ -474,7 +501,7 @@ import Pagination from "@/components/Pagination"; // secondary package based on
export default { export default {
components: { Pagination }, components: { Pagination },
inject:['reload'], inject: ["reload"],
data() { data() {
return { return {
operationList: { operationList: {
@ -578,13 +605,13 @@ export default {
output: {}, output: {},
record_data: [], record_data: [],
record: {}, record: {},
inputData:[], inputData: [],
operationwpData:[], operationwpData: [],
equData:[], equData: [],
recordData:[], recordData: [],
wmaterialData:[], wmaterialData: [],
outputData:[], outputData: [],
tprogressData:[], tprogressData: [],
}; };
}, },
computed: {}, computed: {},
@ -608,7 +635,6 @@ export default {
if (response.data) { if (response.data) {
this.operationData = response.data; this.operationData = response.data;
} }
}); });
}, },
//如果使用边角料提交 //如果使用边角料提交
@ -629,14 +655,12 @@ export default {
if (response.data) { if (response.data) {
this.operationwpData = response.data; this.operationwpData = response.data;
} }
} }
); );
}, },
//操作半成品删除 //操作半成品删除
handleDeletewproduct(scope) handleDeletewproduct(scope) {
{ this.$confirm("确认删除该半成品?", "警告", {
this.$confirm("确认删除该半成品?", "警告", {
confirmButtonText: "确认", confirmButtonText: "确认",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "error", type: "error",
@ -656,15 +680,13 @@ export default {
if (response.data) { if (response.data) {
this.equData = response.data; this.equData = response.data;
} }
}); });
}, },
//操作删除设备 //操作删除设备
handleDeletequip(scope) handleDeletequip(scope) {
{
alert(scope.row.equip_.id); alert(scope.row.equip_.id);
this.$confirm("确认删除该设备?", "警告", { this.$confirm("确认删除该设备?", "警告", {
confirmButtonText: "确认", confirmButtonText: "确认",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "error", type: "error",
@ -684,7 +706,6 @@ export default {
if (response.data) { if (response.data) {
this.recordData = response.data; this.recordData = response.data;
} }
}); });
}, },
//调出表单内容 //调出表单内容
@ -713,7 +734,7 @@ export default {
this.record.record_data = _this.record_data; this.record.record_data = _this.record_data;
createRecord(this.formID, this.record).then((res) => { createRecord(this.formID, this.record).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
this.getrecordLists(); this.getrecordLists();
this.$message.success("创建成功！"); this.$message.success("创建成功！");
this.dialogVisibleForm = false; this.dialogVisibleForm = false;
@ -725,16 +746,14 @@ export default {
getinputLists() { getinputLists() {
getinputList({ operation: this.id, page: 0 }).then((response) => { getinputList({ operation: this.id, page: 0 }).then((response) => {
if (response.data) { if (response.data) {
debugger;
this.inputData = response.data; this.inputData = response.data;
} }
}); });
}, },
cjllclick(){ cjllclick() {
this.dialogTablepick = true;
this.dialogTablepick = true; },
},
//从车间领料 //从车间领料
getwmaterialList() { getwmaterialList() {
@ -764,7 +783,6 @@ export default {
if (response.data) { if (response.data) {
this.outputData = response.data; this.outputData = response.data;
} }
}); });
}, },
//产出物料选择 //产出物料选择
@ -774,7 +792,6 @@ export default {
if (response.data) { if (response.data) {
this.tprogressData = response.data; this.tprogressData = response.data;
} }
} }
); );
}, },
@ -785,22 +802,21 @@ export default {
this.output.count = scope.row.output_count; this.output.count = scope.row.output_count;
createOutput(this.output).then((res) => { createOutput(this.output).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
this.getoutputLists(); this.getoutputLists();
this.$message.success("创建成功！"); this.$message.success("创建成功！");
this.dialogTableoutput = false; this.dialogTableoutput = false;
} }
}); });
}, },
//提交本次操作 //提交本次操作
handlesubmit(){ handlesubmit() {
submitOperation(this.id).then((res) => { submitOperation(this.id).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
this.$message.success("操作提交成功！"); this.$message.success("操作提交成功！");
} }
}); });
} },
}, },
}; };
</script> </script>

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

@ -13,7 +13,7 @@
border border
stripe stripe
style="width: 100%" style="width: 100%"
height="300" height="250"
highlight-current-row highlight-current-row
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
@ -24,7 +24,7 @@
scope.row.number scope.row.number
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column label="生产主产品"> <el-table-column label="生产主产品" width="140">
<template slot-scope="scope" >{{ <template slot-scope="scope" >{{
scope.row.main_product_.name scope.row.main_product_.name
}}</template> }}</template>
@ -59,11 +59,13 @@
<template slot-scope="scope">{{ scope.row.end_date }}</template> <template slot-scope="scope">{{ scope.row.end_date }}</template>
</el-table-column> </el-table-column>
<el-table-column label="状态"> <el-table-column label="状态">
<template slot-scope="scope">{{ <template slot-scope="scope">
{{
state_[scope.row.state] state_[scope.row.state]
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column label="领料状态"> <el-table-column label="领料状态" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.is_picked == false">未领料</el-tag> <el-tag v-if="scope.row.is_picked == false">未领料</el-tag>
<el-tag v-else>已领料</el-tag> <el-tag v-else>已领料</el-tag>
@ -180,7 +182,7 @@
fit fit
stripe stripe
style="width: 100%" style="width: 100%"
max-height="400" max-height="300"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="子计划编号"> <el-table-column label="子计划编号">
@ -257,7 +259,7 @@
fit fit
stripe stripe
highlight-current-row highlight-current-row
max-height="600" max-height="300"
@selection-change="handleSelectionChangess" @selection-change="handleSelectionChangess"
> >
<el-table-column type="selection" width="55"> </el-table-column> <el-table-column type="selection" width="55"> </el-table-column>
@ -295,7 +297,7 @@
<span>生产所需领料表</span> <span>生产所需领料表</span>
</div> </div>
<template> <template>
<el-table :data="needwl" style="width: 100%"> <el-table :data="needwl" highlight-current-row height="300" style="width: 100%">
<el-table-column prop="material_.name" label="物料名称"> <el-table-column prop="material_.name" label="物料名称">
</el-table-column> </el-table-column>
<el-table-column prop="material_.number" label="物料编号"> <el-table-column prop="material_.number" label="物料编号">
@ -322,7 +324,7 @@
> >
</div> </div>
<template> <template>
<el-table :data="havewl" style="width: 100%" > <el-table :data="havewl" highlight-current-row height="300" style="width: 100%" >
<el-table-column prop="batch" label="物料批次"> </el-table-column> <el-table-column prop="batch" label="物料批次"> </el-table-column>
<el-table-column prop="material_.name" label="物料名称"> <el-table-column prop="material_.name" label="物料名称">
@ -354,7 +356,8 @@
<el-table-column align="center" label="操作" width="220px"> <el-table-column align="center" label="操作" width="220px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link <el-link
v-if="checkPermission(['warehouse_update'])" v-if="scope.row.material_.type==2"
@click="handlewproduct(scope)" @click="handlewproduct(scope)"
>选择半成品</el-link >选择半成品</el-link
> >