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

guize

This commit is contained in:
shilixia 2021-11-16 10:38:17 +08:00
parent f63bb65a9e
commit 4e0d5f4f2e
16 changed files with 643 additions and 527 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hb_client/src/router/index.js
View File

@ -189,7 +189,7 @@ export const asyncRoutes = [
path: 'need/:id',
name: 'need',
component: () => import('@/views/wpm/need'),
meta: { title: '检测项目', icon: 'example', perms: ['index_manage'] }
meta: { title: '半成品检验', icon: 'example', perms: ['index_manage'] }
}
]
},

9
hb_client/src/views/em/detection.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

9
hb_client/src/views/em/equipment.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

9
hb_client/src/views/em/record.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

9
hb_client/src/views/inm/fifo.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="仓库名称/仓库编号"
@ -26,11 +29,7 @@
</div>
</el-card>
<el-card style="margin-top: 2px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增出入库记录</el-button
>
</div>
<el-table
v-loading="listLoading"
:data="fifoList.results"

9
hb_client/src/views/inm/warehouse.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

9
hb_client/src/views/mtm/material.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

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

File diff suppressed because it is too large Load Diff

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

@ -274,7 +274,9 @@ export default {
},
handleclick(scope){
this.orderID = scope.row.id;
this.countsx = scope.row.count;
this.planed_count = scope.row.planed_count;
this.delivery_date = scope.row.delivery_date;
this.dialogVisible = true;
this.$nextTick(() => {
this.$refs["Form"].clearValidate();
@ -284,9 +286,18 @@ export default {
async confirm(form) {
this.orderplan.start_date = this.value1[0];
this.orderplan.end_date = this.value1[1];
if( this.delivery_date>=this.value1[1])
{
this.orderplan.end_date = this.value1[1];
}
else{
this.$message.error("计划完成时间超过订单交付日期，请从新选择日期！");
}
this.orderplan.order = this.orderID
createProductionplan(this.orderplan).then((res) => {
if( this.orderplan.count<=(this.countsx-this.planed_count)){
createProductionplan(this.orderplan).then((res) => {
if (res.code >= 200) {
this.getorderList();
this.getplanList();
@ -294,6 +305,12 @@ export default {
this.$message.success("成功");
}
});
}
else
{
this.$message.error("排产数超过所需数，请合理排产！");
}
},
handleWork(scope)
{

7
hb_client/src/views/pm/resources.vue
View File

@ -90,6 +90,7 @@
fit
stripe
style="width: 100%"
height="320"
>
<el-table-column type="index" width="50" />
@ -130,7 +131,7 @@
fit
stripe
style="width: 100%"
height="300"
>
<el-table-column type="index" width="50" />
@ -151,8 +152,8 @@
</el-table>
<pagination
v-show="orderList.count > 0"
:total="orderList.count"
v-show="equipmentTable.count > 0"
:total="equipmentTable.count"
:page.sync="listQuery.page"
:limit.sync="listQuery.page_size"
@pagination="getorderList"

9
hb_client/src/views/sam/contract.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

9
hb_client/src/views/sam/customer.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

9
hb_client/src/views/sam/order.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

9
hb_client/src/views/sam/review.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

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

@ -24,16 +24,12 @@
>重置</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
v-loading="listLoading"
:data="testitemList.results"
:data="wproductList.results"
border
fit
stripe
@ -41,44 +37,28 @@
max-height="600"
>
<el-table-column type="index" width="50" />
<el-table-column label="项目名称">
<template slot-scope="scope">{{ scope.row.name }}</template>
<el-table-column label="半成品名称">
<template slot-scope="scope">{{ scope.row.m_state_.name }}</template>
</el-table-column>
<el-table-column label="条款号">
<template slot-scope="scope">{{ scope.row.term_number }}</template>
</el-table-column>
<el-table-column label="标准名称">
<template slot-scope="scope">{{ scope.row.standard_.name }}</template>
</el-table-column>
<el-table-column label="标准编号">
<template slot-scope="scope">{{
scope.row.standard_.number
}}</template>
<el-table-column label="半成品编号">
<template slot-scope="scope">{{ scope.row.m_state_.number }}</template>
</el-table-column>
<el-table-column label="创建时间">
<template slot-scope="scope">{{ scope.row.create_time }}</template>
</el-table-column>
<el-table-column align="center" label="操作" width="220px">
<template slot-scope="scope">
<el-link
v-if="checkPermission(['warehouse_update'])"
@click="handleEdit(scope)"
>编辑</el-link
>
<el-link
v-if="checkPermission(['warehouse_delete'])"
type="danger"
@click="handleDelete(scope)"
>删除</el-link
@click="handleInspection(scope)"
>检验</el-link
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="testitemList.count > 0"
:total="testitemList.count"
v-show="wproductList.count > 0"
:total="wproductList.count"
:page.sync="listQuery.page"
:limit.sync="listQuery.page_size"
@pagination="getList"
@ -126,12 +106,8 @@
</template>
<script>
import {
getTestitemList,
createTestitem,
updateTestitem,
deleteTestitem,
getStandardList,
} from "@/api/qm";
getwproductList,
} from "@/api/wpm";
import checkPermission from "@/utils/permission";
import { genTree } from "@/utils";
@ -142,7 +118,7 @@ export default {
data() {
return {
testitem: defaultetestitem,
testitemList: {
wproductList: {
count: 0,
},
listQuery: {
@ -167,12 +143,13 @@ export default {
},
methods: {
checkPermission,
//列表
//半成品列表
getList() {
this.listLoading = true;
getTestitemList(this.listQuery).then((response) => {
this.listQuery.act_state=2
getwproductList(this.listQuery).then((response) => {
if (response.data) {
this.testitemList = response.data;
this.wproductList = response.data;
}
this.listLoading = false;
});

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

@ -641,18 +641,9 @@ export default {
//确认领料
handlePick() {
let _this = this;
_this.picks = []; //所需物料
this.$refs.multipleTable.selection.forEach((item) => {
_this.picks.push({
warehouse:item.warehouse,
material: item.material,
batch: item.batch,
pick_count: item.pick_count,
});
});
this.pickData.subproduction_plan = this.id;
this.pickData.picks = this.picks;
this.pickData.picks = this.havewl;
// console.log(this.pickData);