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
stripe
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 label="出入记录ID">

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

@ -33,7 +33,9 @@
fit
stripe
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 label="物料批次">

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

@ -37,7 +37,9 @@
fit
stripe
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 label="仓库名称">

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

@ -9,7 +9,9 @@
fit
stripe
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 label="半成品编号">

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

@ -37,9 +37,9 @@
fit
stripe
highlight-current-row
max-height="600"
max-height="620"
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 label="物料编号">

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

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

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

@ -15,9 +15,9 @@
border
fit
stripe
highlight-current-row
max-height="620"
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 label="工序编号">

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

@ -13,6 +13,7 @@
stripe
style="width: 100%"
height="300"
>
<el-table-column type="index" width="50" />
@ -99,6 +100,7 @@
style="width: 100%"
height="250"
>
<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">
<el-card>
<div>
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增供应商</el-button >
<el-input
v-model="listQuery.search"
placeholder="供应商名称"
@ -24,11 +28,7 @@
>重置</el-button
>
</div>
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增供应商</el-button
>
</div>
</el-card>
<el-card style="margin-top: 2px">
<el-table
@ -38,7 +38,9 @@
fit
stripe
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 label="供应商名">

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

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

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

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

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

@ -1,9 +1,7 @@
<template>
<div class="app-container">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>操作记录表</span>
</div>
<el-table
:data="operationList.results"
@ -11,7 +9,9 @@
fit
stripe
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" />

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

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-card >
<el-card >
<el-card>
<el-card>
<div slot="header" class="clearfix">
<span>基本信息</span>
</div>
@ -33,7 +33,7 @@
<el-form-item label="边角料">
<el-radio-group v-model="operationData.use_scrap">
<el-radio
<el-radio border
:label="item.value"
:key="item.value"
v-for="item in scrap"
@ -59,13 +59,20 @@
</div>
<template>
<el-table :data="operationwpData" border
<el-table
:data="operationwpData"
border
fit
stripe highlight-current-row
height="230" style="width: 100%" >
stripe
highlight-current-row
height="230"
style="width: 100%"
>
<el-table-column type="index" width="50" />
<el-table-column prop="subproduction_plan_.number" label="子计划编号">
<el-table-column
prop="subproduction_plan_.number"
label="子计划编号"
>
</el-table-column>
<el-table-column prop="number" label="半成品编号">
</el-table-column>
@ -85,16 +92,21 @@
</template>
</el-card>
</el-col>
<el-col span="8" >
<el-card class="box-card" >
<el-col span="8">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>设备</span>
</div>
<template>
<el-table :data="equData" border
<el-table
:data="equData"
border
fit
stripe highlight-current-row
height="230" style="width: 100%" >
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="设备名称">
@ -118,10 +130,15 @@
<span>自定义表格</span>
</div>
<template>
<el-table :data="recordData" border
<el-table
:data="recordData"
border
fit
stripe highlight-current-row
height="230" style="width: 100%">
stripe
highlight-current-row
height="230"
style="width: 100%"
>
<el-table-column prop="form_.name" label="表名">
</el-table-column>
<el-table-column label="是否填写">
@ -264,21 +281,28 @@
>
</div>
<template>
<el-table :data="inputData" border
<el-table
:data="inputData"
border
fit
stripe highlight-current-row
height="230" style="width: 100%">
stripe
highlight-current-row
height="230"
style="width: 100%"
>
<el-table-column
prop="subproduction_plan_.number"
label="子计划编号"
>
</el-table-column>
<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>
<el-table-column prop="material_.unit" label="物料单位">
</el-table-column>
<el-table-column prop="count" label="消耗数量"> </el-table-column>
<el-table-column prop="count" label="消耗数量">
</el-table-column>
</el-table>
<el-dialog title="车间物料" :visible.sync="dialogTablepick">
<el-table
@ -302,10 +326,14 @@
}}</template>
</el-table-column>
<el-table-column label="物料批次">
<template slot-scope="scope">{{ scope.row.batch }}</template>
<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 label="实际使用数量" width="140px">
<template slot-scope="scope">
@ -346,10 +374,15 @@
>选择产出</el-button
>
</div>
<el-table :data="outputData" border
<el-table
:data="outputData"
border
fit
stripe highlight-current-row
height="230" style="width: 100%">
stripe
highlight-current-row
height="230"
style="width: 100%"
>
<el-table-column
prop="subproduction_plan_.number"
label="子计划编号"
@ -392,7 +425,6 @@
<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">
@ -420,31 +452,26 @@
</el-dialog>
</el-card>
</el-col>
<el-col span="8" >
<el-card class="box-card" >
<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-card>
<el-button type="primary" style="float: right" @click="handlesubmit()"
>提交本次操作</el-button
>
</el-card>
</el-card>
</div>
</template>
<style scoped>
.box-card {
height: 300px;
}
}
</style>
</style>
<script>
@ -464,7 +491,7 @@ import {
deleteOperationequip,
deleteOperationwproduct,
gettoolList,
createTool
createTool,
} from "@/api/wpm";
import { getrffieldList } from "@/api/mtm";
@ -474,7 +501,7 @@ import Pagination from "@/components/Pagination"; // secondary package based on
export default {
components: { Pagination },
inject:['reload'],
inject: ["reload"],
data() {
return {
operationList: {
@ -578,13 +605,13 @@ export default {
output: {},
record_data: [],
record: {},
inputData:[],
operationwpData:[],
equData:[],
recordData:[],
wmaterialData:[],
outputData:[],
tprogressData:[],
inputData: [],
operationwpData: [],
equData: [],
recordData: [],
wmaterialData: [],
outputData: [],
tprogressData: [],
};
},
computed: {},
@ -608,7 +635,6 @@ export default {
if (response.data) {
this.operationData = response.data;
}
});
},
//如果使用边角料提交
@ -629,13 +655,11 @@ export default {
if (response.data) {
this.operationwpData = response.data;
}
}
);
},
//操作半成品删除
handleDeletewproduct(scope)
{
handleDeletewproduct(scope) {
this.$confirm("确认删除该半成品?", "警告", {
confirmButtonText: "确认",
cancelButtonText: "取消",
@ -656,12 +680,10 @@ export default {
if (response.data) {
this.equData = response.data;
}
});
},
//操作删除设备
handleDeletequip(scope)
{
handleDeletequip(scope) {
alert(scope.row.equip_.id);
this.$confirm("确认删除该设备?", "警告", {
@ -684,7 +706,6 @@ export default {
if (response.data) {
this.recordData = response.data;
}
});
},
//调出表单内容
@ -725,14 +746,12 @@ export default {
getinputLists() {
getinputList({ operation: this.id, page: 0 }).then((response) => {
if (response.data) {
debugger;
this.inputData = response.data;
}
});
},
cjllclick(){
cjllclick() {
this.dialogTablepick = true;
},
@ -764,7 +783,6 @@ export default {
if (response.data) {
this.outputData = response.data;
}
});
},
//产出物料选择
@ -774,7 +792,6 @@ export default {
if (response.data) {
this.tprogressData = response.data;
}
}
);
},
@ -792,15 +809,14 @@ export default {
}
});
},
//提交本次操作
handlesubmit(){
//提交本次操作
handlesubmit() {
submitOperation(this.id).then((res) => {
if (res.code >= 200) {
this.$message.success("操作提交成功！");
}
});
}
},
},
};
</script>

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

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