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

Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

This commit is contained in:
caoqianming 2021-12-02 09:55:14 +08:00
parent e5d45c7577 f22078bb0a
commit d153fb458d
22 changed files with 69 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hb_client/src/views/em/detection.vue
View File

@ -126,6 +126,7 @@
</el-card> </el-card>
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false"
:title="dialogType === 'edit' ? '编辑设备' : '新增设备'" :title="dialogType === 'edit' ? '编辑设备' : '新增设备'"
> >
<el-form <el-form

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

@ -135,6 +135,7 @@
</el-card> </el-card>
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false"
:title="dialogType === 'edit' ? '编辑设备' : '新增设备'" :title="dialogType === 'edit' ? '编辑设备' : '新增设备'"
> >
<el-form <el-form

1
hb_client/src/views/em/record.vue
View File

@ -94,6 +94,7 @@
</el-card> </el-card>
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false"
:title="dialogType === 'edit' ? '编辑校准检定' : '新增校准检定'" :title="dialogType === 'edit' ? '编辑校准检定' : '新增校准检定'"
> >
<el-form <el-form

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

@ -97,6 +97,7 @@
</el-card> </el-card>
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false"
:title="dialogType === 'edit' ? '编辑出/如库记录' : '新增出/如库记录'" :title="dialogType === 'edit' ? '编辑出/如库记录' : '新增出/如库记录'"
> >
<el-form <el-form

3
hb_client/src/views/inm/fifodetail.vue
View File

@ -67,7 +67,7 @@
/> />
</el-card> </el-card>
<el-dialog title="物料检查表" :visible.sync="outerVisible"> <el-dialog title="物料检查表" :close-on-click-modal="false" :visible.sync="outerVisible">
<el-select style="width: 100%" v-model="recordform" placeholder="请选择"> <el-select style="width: 100%" v-model="recordform" placeholder="请选择">
<el-option <el-option
v-for="item in recordformList" v-for="item in recordformList"
@ -82,6 +82,7 @@
width="30%" width="30%"
title="检查项目" title="检查项目"
:visible.sync="innerVisible" :visible.sync="innerVisible"
:close-on-click-modal="false"
append-to-body append-to-body
> >
<el-form label-width="80px" label-position="right"> <el-form label-width="80px" label-position="right">

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

@ -87,6 +87,7 @@
</el-card> </el-card>
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false"
:title="dialogType === 'edit' ? '编辑仓库' : '新增仓库'" :title="dialogType === 'edit' ? '编辑仓库' : '新增仓库'"
> >
<el-form <el-form

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

@ -116,6 +116,7 @@
</el-card> </el-card>
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false"
:title="dialogType === 'edit' ? '编辑物料' : '新增物料'" :title="dialogType === 'edit' ? '编辑物料' : '新增物料'"
> >
<el-form <el-form

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

@ -61,6 +61,7 @@
<!--新增、编辑记录表格--> <!--新增、编辑记录表格-->
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false"
:title="dialogType === 'edit' ? '编辑记录表格' : '新增记录表格'" :title="dialogType === 'edit' ? '编辑记录表格' : '新增记录表格'"
> >
<el-form <el-form
@ -85,6 +86,7 @@
<!--表格展示--> <!--表格展示-->
<el-dialog <el-dialog
:visible.sync="dialogVisibleForm" :visible.sync="dialogVisibleForm"
:close-on-click-modal="false"
:title="tableForm.name" :title="tableForm.name"
> >
<el-form ref="Forms" label-width="80px" :model="checkForm"> <el-form ref="Forms" label-width="80px" :model="checkForm">
@ -316,6 +318,7 @@
<!--表格字段新增编辑--> <!--表格字段新增编辑-->
<el-dialog <el-dialog
:visible.sync="dialogVisible1" :visible.sync="dialogVisible1"
:close-on-click-modal="false"
:title="dialogType1 === 'edit' ? '编辑表格字段' : '新增表格字段'" :title="dialogType1 === 'edit' ? '编辑表格字段' : '新增表格字段'"
> >
<el-form <el-form

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

@ -76,6 +76,7 @@
/> />
</el-card> </el-card>
<el-dialog <el-dialog
:close-on-click-modal="false"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:title="dialogType === 'edit' ? '编辑工序' : '新增工序'" :title="dialogType === 'edit' ? '编辑工序' : '新增工序'"
> >

5
hb_client/src/views/mtm/step.vue
View File

@ -61,6 +61,7 @@
</el-table> </el-table>
<el-dialog <el-dialog
:visible.sync="dialogVisibles" :visible.sync="dialogVisibles"
:close-on-click-modal="false"
:title="dialogTypes === 'edit' ? '编辑工序' : '新增工序'" :title="dialogTypes === 'edit' ? '编辑工序' : '新增工序'"
> >
<el-form <el-form
@ -175,6 +176,7 @@
</el-table> </el-table>
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false"
:title="dialogType === 'edit' ? '编辑记录表格' : '新增记录表格'" :title="dialogType === 'edit' ? '编辑记录表格' : '新增记录表格'"
> >
<el-form <el-form
@ -216,6 +218,7 @@
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:model="tableForm" :model="tableForm"
:close-on-click-modal="false"
:visible.sync="dialogVisibleForm" :visible.sync="dialogVisibleForm"
:title="tableForm.name"> :title="tableForm.name">
<el-form <el-form
@ -349,7 +352,7 @@
:limit.sync="listQueryfield.page_size" :limit.sync="listQueryfield.page_size"
@pagination="fieldLists" @pagination="fieldLists"
/> />
<el-dialog :visible.sync="dialogVisible1" :title="dialogType1 === 'edit' ? '编辑表格字段' : '新增表格字段'"> <el-dialog :visible.sync="dialogVisible1" :close-on-click-modal="false" :title="dialogType1 === 'edit' ? '编辑表格字段' : '新增表格字段'">
<el-form ref="Form" :model="field" label-width="80px" label-position="right"> <el-form ref="Form" :model="field" label-width="80px" label-position="right">
<el-form-item label="字段类型" prop="field_type"> <el-form-item label="字段类型" prop="field_type">
<el-select style="width: 100%" v-model="field.field_type" placeholder="请选择"> <el-select style="width: 100%" v-model="field.field_type" placeholder="请选择">

2
hb_client/src/views/mtm/stepdo.vue
View File

@ -66,6 +66,7 @@
</el-table> </el-table>
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false"
:title="dialogType === 'edit' ? '编辑记录表格' : '新增记录表格'" :title="dialogType === 'edit' ? '编辑记录表格' : '新增记录表格'"
> >
<el-form <el-form
@ -160,6 +161,7 @@
</el-table> </el-table>
<el-dialog <el-dialog
:visible.sync="dialogVisible1" :visible.sync="dialogVisible1"
:close-on-click-modal="false"
:title="dialogType1 === 'edit' ? '编辑表格字段' : '新增表格字段'" :title="dialogType1 === 'edit' ? '编辑表格字段' : '新增表格字段'"
> >
<el-form <el-form

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

@ -162,6 +162,7 @@
/> />
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false"
:title="'排产计划'" :title="'排产计划'"
> >
<el-form <el-form

6
hb_client/src/views/pm/work.vue
View File

@ -18,10 +18,10 @@
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="“产品名称”"> <el-table-column label="产品名称">
<template slot-scope="scope">{{ scope.row.product_.name }}</template> <template slot-scope="scope">{{ scope.row.product_.name }}</template>
</el-table-column> </el-table-column>
<el-table-column label="“产品型号”"> <el-table-column label="产品型号">
<template slot-scope="scope">{{ scope.row.product_.specification }}</template> <template slot-scope="scope">{{ scope.row.product_.specification }}</template>
</el-table-column> </el-table-column>
<el-table-column label="名称"> <el-table-column label="名称">
@ -102,6 +102,7 @@
</el-card> </el-card>
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false"
> >
<el-form <el-form
ref="Form" ref="Form"
@ -140,6 +141,7 @@
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:visible.sync="dialogVisibles" :visible.sync="dialogVisibles"
:close-on-click-modal="false"
> >
<el-table <el-table

1
hb_client/src/views/sam/contract.vue
View File

@ -98,6 +98,7 @@
</el-card> </el-card>
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false"
:title="dialogType === 'edit' ? '编辑合同' : '新增合同'" :title="dialogType === 'edit' ? '编辑合同' : '新增合同'"
> >
<el-form <el-form

1
hb_client/src/views/sam/customer.vue
View File

@ -91,6 +91,7 @@
</el-card> </el-card>
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false"
:title="dialogType === 'edit' ? '编辑客户' : '新增客户'" :title="dialogType === 'edit' ? '编辑客户' : '新增客户'"
> >
<el-form <el-form

1
hb_client/src/views/sam/order.vue
View File

@ -98,6 +98,7 @@
</el-card> </el-card>
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false"
:title="dialogType === 'edit' ? '编辑订单' : '新增订单'" :title="dialogType === 'edit' ? '编辑订单' : '新增订单'"
> >
<el-form <el-form

1
hb_client/src/views/sam/review.vue
View File

@ -97,6 +97,7 @@
</el-card> </el-card>
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false"
:title="dialogType === 'edit' ? '编辑合同' : '新增合同'" :title="dialogType === 'edit' ? '编辑合同' : '新增合同'"
> >
<el-form <el-form

4
hb_client/src/views/wpm/need.vue
View File

@ -147,7 +147,7 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-dialog title="物料检查表" :visible.sync="outerVisible"> <el-dialog title="物料检查表" :close-on-click-modal="false" :visible.sync="outerVisible">
<el-select style="width: 100%" v-model="recordform" placeholder="请选择"> <el-select style="width: 100%" v-model="recordform" placeholder="请选择">
<el-option <el-option
v-for="item in recordformList" v-for="item in recordformList"
@ -302,7 +302,7 @@
> >
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="半成品入库" :visible.sync="dialogFormVisible"> <el-dialog title="半成品入库" :close-on-click-modal="false" :visible.sync="dialogFormVisible">
<el-form :model="form"> <el-form :model="form">
<el-form-item label="仓库" :label-width="formLabelWidth"> <el-form-item label="仓库" :label-width="formLabelWidth">
<el-select <el-select

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

@ -37,13 +37,30 @@
</el-table-column> </el-table-column>
<el-table-column label="过程记录表"> <el-table-column label="过程记录表">
<template slot-scope="scope">{{ scope.row.record_count }}</template>
<template slot-scope="scope" v-if="scope.row.record_">
<el-tag v-for="item in scope.row.record_"
:key="item.id"
:label="item.name"
:value="item.id">{{item.name}}</el-tag>
</template>
</el-table-column> </el-table-column>
<el-table-column label="产品数量"> <el-table-column label="产品数量">
<template slot-scope="scope">{{ scope.row.wproduct_count }}</template> <template slot-scope="scope" v-if="scope.row.wproduct_">
{{ scope.row.wproduct_.length }}
</template>
</el-table-column> </el-table-column>
<el-table-column label="设备数量"> <el-table-column label="生产设备">
<template slot-scope="scope">{{ scope.row.equip_count }}</template> <template slot-scope="scope" v-if="scope.row.equip_">
<el-tag v-for="item in scope.row.equip_"
:key="item.id"
:label="item.number"
:value="item.id">{{item.number}}</el-tag>
</template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间"> <el-table-column label="创建时间">

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

@ -159,6 +159,7 @@
<el-dialog <el-dialog
:model="tableForm" :model="tableForm"
:visible.sync="dialogVisibleForm" :visible.sync="dialogVisibleForm"
:close-on-click-modal="false"
:title="tableForm.name" :title="tableForm.name"
> >
<el-form label-width="80px" label-position="right"> <el-form label-width="80px" label-position="right">
@ -303,7 +304,7 @@
<el-table-column prop="count" label="消耗数量"> <el-table-column prop="count" label="消耗数量">
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-dialog title="车间物料" :visible.sync="dialogTablepick"> <el-dialog title="车间物料" :close-on-click-modal="false" :visible.sync="dialogTablepick">
<el-table <el-table
:data="wmaterialData" :data="wmaterialData"
border border
@ -394,7 +395,7 @@
</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="dialogTableoutput"> <el-dialog title="产出物料" :close-on-click-modal="false" :visible.sync="dialogTableoutput">
<el-table <el-table
:data="tprogressData" :data="tprogressData"
border border

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

@ -24,6 +24,12 @@
scope.row.number scope.row.number
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column label="产品名称">
<template slot-scope="scope">{{ scope.row.product_.name }}</template>
</el-table-column>
<el-table-column label="产品型号">
<template slot-scope="scope">{{ scope.row.product_.specification }}</template>
</el-table-column>
<el-table-column label="生产主产品" width="140"> <el-table-column label="生产主产品" width="140">
<template slot-scope="scope" >{{ <template slot-scope="scope" >{{
scope.row.main_product_.name scope.row.main_product_.name
@ -217,7 +223,7 @@
</el-row> </el-row>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-dialog title="领半成品" :visible.sync="dialogTableVisiblepick"> <el-dialog title="领半成品" :close-on-click-modal="false" :visible.sync="dialogTableVisiblepick">
<el-table :data="bcplist" style="width: 100%"> <el-table :data="bcplist" style="width: 100%">
<el-table-column prop="material_.name" label="物料名称"> <el-table-column prop="material_.name" label="物料名称">
@ -256,7 +262,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="半成品列表" :visible.sync="dialogTableVisiblepicks"> <el-dialog title="半成品列表" :close-on-click-modal="false" :visible.sync="dialogTableVisiblepicks">
<el-table <el-table
:data="wproductslist" :data="wproductslist"
@ -296,7 +302,7 @@
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogVisiblenw" width="80%" title="领料"> <el-dialog :visible.sync="dialogVisiblenw" :close-on-click-modal="false" width="80%" title="领料">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>生产所需领料表</span> <span>生产所需领料表</span>
@ -372,7 +378,7 @@
</template> </template>
</el-card> </el-card>
</el-dialog> </el-dialog>
<el-dialog title="半成品列表" :visible.sync="dialogTableVisible"> <el-dialog title="半成品列表" :close-on-click-modal="false" :visible.sync="dialogTableVisible">
<el-table <el-table
:data="iproductData" :data="iproductData"
@ -409,6 +415,7 @@
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:visible.sync="dialogVisiblework" :visible.sync="dialogVisiblework"
:close-on-click-modal="false"
:fullscreen="true" :fullscreen="true"
title="填写记录" title="填写记录"
> >

9
hb_client/src/views/wpm/worktaskcopy.vue
View File

@ -199,7 +199,7 @@
</el-row> </el-row>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-dialog title="领半成品" :visible.sync="dialogTableVisiblepick"> <el-dialog title="领半成品" :close-on-click-modal="false" :visible.sync="dialogTableVisiblepick">
<el-table :data="bcplist" style="width: 100%"> <el-table :data="bcplist" style="width: 100%">
<el-table-column prop="material_.name" label="物料名称"> <el-table-column prop="material_.name" label="物料名称">
</el-table-column> </el-table-column>
@ -237,7 +237,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="半成品列表" :visible.sync="dialogTableVisiblepicks"> <el-dialog title="半成品列表" :close-on-click-modal="false" :visible.sync="dialogTableVisiblepicks">
<el-table <el-table
:data="wproductslist" :data="wproductslist"
@ -276,7 +276,7 @@
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogVisiblenw" width="80%" title="领料"> <el-dialog :visible.sync="dialogVisiblenw" :close-on-click-modal="false" width="80%" title="领料">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>生产所需领料表</span> <span>生产所需领料表</span>
@ -351,7 +351,7 @@
</template> </template>
</el-card> </el-card>
</el-dialog> </el-dialog>
<el-dialog title="半成品列表" :visible.sync="dialogTableVisible"> <el-dialog title="半成品列表" :close-on-click-modal="false" :visible.sync="dialogTableVisible">
<el-table <el-table
:data="iproductData" :data="iproductData"
@ -388,6 +388,7 @@
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:visible.sync="dialogVisiblework" :visible.sync="dialogVisiblework"
:close-on-click-modal="false"
:fullscreen="true" :fullscreen="true"
title="填写记录" title="填写记录"
> >