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 2022-03-01 15:26:11 +08:00
parent c3a6fa7441 bf3dd8b083
commit 8f72edf40b
2 changed files with 161 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@
class="filter-item"
type="primary"
icon="el-icon-refresh-left"
@click="resetFilter"
@click="resetFilter1"
>重置
</el-button>
<el-table
@ -90,7 +90,6 @@
:limit.sync="listQuery.page_size"
@pagination="getList"
/>
<el-dialog title="半成品报废" :close-on-click-modal="false" :visible.sync="dialogFormVisiblebcp">
<el-form :model="formbcp">
<el-form-item label="甩片原因" :label-width="formLabelWidth">
@ -400,12 +399,9 @@
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<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.number }}</template>
</el-table-column>
@ -423,20 +419,19 @@
<el-table-column label="所在子工序" :filters="[{ text: '切割', value: '切割' },{ text: '磨边', value: '磨边' },
{ text: '清洗', value: '清洗' }, { text: '热弯成型', value: '热弯成型' },{ text: '化学钢化', value: '化学钢化' },
{ text: '镀膜', value: '镀膜' }, { text: '断膜', value: '断膜' },{ text: '汇流条制备', value: '汇流条制备' },
{ text: '夹层', value: '夹层' }, { text: '包边', value: '包边' }]"
:filter-method="filterTag">
{ text: '夹层', value: '夹层' }, { text: '包边', value: '包边' }]" :filter-method="filterTag">
<template slot-scope="scope">{{ scope.row.step_.name }}</template>
</el-table-column>
<el-table-column align="center" label="操作" width="220px">
<template slot-scope="scope">
<el-link
v-if="checkPermission(['warehouse_update'])"
@click="handleInspection(scope)"
v-if="scope.row.test===null"
@click="handleInspection(scope,'3')"
>检验
</el-link>
<el-link
v-if="scope.row.test!==null"
@click="checkRecord(scope,'1')"
@click="checkRecord(scope,'3')"
>检验记录
</el-link>
</template>
@ -946,24 +941,15 @@
handleClick(tab) {
this.listLoading = true;
this.listQuery.type = tab.name;
if(tab.name==1)
{
if (tab.name == 1) {
this.getList();
}
else if(tab.name==2)
{
} else if (tab.name == 2) {
this.getList2();
}
else if(tab.name==3)
{
} else if (tab.name == 3) {
this.getList1();
}
else if(tab.name==4)
{
} else if (tab.name == 4) {
this.getList4();
}
else if(tab.name==5)
{
} else if (tab.name == 5) {
this.getList3();
}
@ -1204,7 +1190,11 @@
// this.outerVisible = true;
that.wproduct = scope.row.id;//半成品ID
that.listQueryrecordform.material = scope.row.material;
if (index === '3') {
that.listQueryrecordform.type = 40;
} else {
that.listQueryrecordform.type = 20;
}
that.listQueryrecordform.enabled = true;
that.recordform = null;
getrecordformList(that.listQueryrecordform).then((response) => {
@ -1251,7 +1241,7 @@
that.recordId = scope.row.id;
that.recordform = scope.row.form;
that.formName = scope.row.form_.name;
if(that.innerIndex==='1'){//非复检
if (that.innerIndex !== '2') {//非复检
getrffieldList({form: this.recordform, enabled: true, page: 1, page_size: 100}).then((response) => {
if (response.data) {
that.hasPicture = false;
@ -1378,7 +1368,7 @@
this.outerVisible = false;
that.fieldList = [];
if (that.recordform != "") {
if (index === '1') {//非复检
if (index !== '2') {//非复检
testInit({wproduct: that.wproduct, form: that.recordform}).then((response) => {
if (response.data) {
that.hasPicture = false;

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

@ -18,7 +18,6 @@
scope.row.material_.name
}}</template>
</el-table-column>
<el-table-column label="成品编号">
<template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column>
@ -27,7 +26,6 @@
{{ actstate_[scope.row.act_state] }}
</template>
</el-table-column>
<el-table-column label="所在子工序">
<template slot-scope="scope">{{ scope.row.step_.name }}</template>
</el-table-column>
@ -59,14 +57,11 @@
/>
</el-card>
</el-tab-pane>
<el-tab-pane label="已合格成品">
<el-card style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>批量入库
</el-button>
<el-table
v-loading="listLoading"
:data="wproductList1.results"
@ -99,19 +94,15 @@
</template>
</el-table-column>
<el-table-column label="客户">
<template slot-scope="scope" v-if="scope.row.to_order_.customer_">
<template slot-scope="scope" v-if="scope.row.to_order_">
{{scope.row.to_order_.customer_.name }}
</template>
</el-table-column>
<el-table-column label="合同">
<template slot-scope="scope" v-if="scope.row.to_order_.contract_">
<template slot-scope="scope" v-if="scope.row.to_order_">
{{scope.row.to_order_.contract_.name }}
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="220px">
<template slot-scope="scope">
<el-link
@ -504,7 +495,7 @@ export default {
//调该物料对应的检查表
this.wproduct = scope.row.id; //成品ID
this.listQueryrecordform.material = scope.row.material; //
this.listQueryrecordform.type = 2;
this.listQueryrecordform.type = 40;
this.recordform = null;
getrecordformList(this.listQueryrecordform).then((response) => {
if (response.data) {