suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

质量缺陷修复

Browse Source
dev-scheduling
jinna 3 weeks ago
parent 8ee0e7b255
commit baff048dec
3 changed files with 481 additions and 441 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/views/productionTesting/prPlanTestRec.vue
  2. 32
      src/views/productionTesting/productionQuality.vue
  3. 231
      src/views/qualityManagement/reviewFormMess/index.vue

9
src/views/productionTesting/prPlanTestRec.vue
Unescape View File

@ -66,7 +66,7 @@ export default {
labelWidth: 120,
searchLabelWidth: 120,
menu: true,
menuWidth: 120,
menuWidth: 80,
dialogWidth: 1200,
dialogClickModal: false,
searchEnter: true,
@ -81,13 +81,14 @@ export default {
searchLabelPosition:'left',
searchGutter:24,
searchSpan:6,
menuAlign: 'left',
menuAlign: 'center',
gridBtn:false,
searchMenuPosition:'right',
column: [
{
label: '流程卡号',
prop: 'cardNo',
prop:"code",
// prop: 'cardNo',
// bind: 'prWorkPlan.prWorkOrder.cardNo',
width: 200,
search: true,
@ -103,7 +104,7 @@ export default {
},
{
label: '转试人',
prop: 'testUserRealName',
prop: 'testUserName',
// bind: 'testUser.userName',
width: 200,
search: false,

32
src/views/productionTesting/productionQuality.vue
Unescape View File

@ -165,24 +165,28 @@
circle
type="danger"
icon="el-icon-delete"
@click="removeRules(scope.row.wpItemDetailList,subScope.$index, subScope.row)"
@click="removeRules(scope.row.wpItemDetailList,subScope.$index, scope.row)"
/>
</template>
</el-table-column>
<el-table-column label="镀前镀后" prop="testType" align="center">
<template #default="scope">
<el-input v-model="scope.row.testType" :disabled="scope.row.checkUserRealName != null && scope.row.checkUserRealName != '' "></el-input>
<template #default="scope1">
<el-input v-model="scope1.row.testType"
:disabled="scope.row.checkUserRealName != null && scope.row.checkUserRealName != '' "
></el-input>
</template>
</el-table-column>
<el-table-column label="尺寸" prop="ruleSize" align="center">
<template #default="scope">
<el-input v-model="scope.row.ruleSize" :disabled="scope.row.checkUserRealName != null && scope.row.checkUserRealName != '' "></el-input>
<template #default="scope1">
<el-input v-model="scope1.row.ruleSize"
:disabled="scope.row.checkUserRealName != null && scope.row.checkUserRealName != '' "
></el-input>
</template>
</el-table-column>
<el-table-column label="量具" prop="tools" align="center">
<template #default="scope">
<template #default="scope1">
<!-- {{scope.row.mtName}} -->
<el-input v-model="scope.row.mtName" :disabled="scope.row.checkUserRealName != null && scope.row.checkUserRealName != '' "></el-input>
<el-input v-model="scope1.row.mtName" :disabled="scope.row.checkUserRealName != null && scope.row.checkUserRealName != '' "></el-input>
</template>
</el-table-column>
<el-table-column label="量具编号" prop="trialNo" align="center">
@ -261,7 +265,7 @@
circle
type="danger"
icon="el-icon-delete"
@click="removeSpecimen(subScope.$index, subScope.row)"
@click="removeSpecimen(subScope.$index, subScope.row,scope.row)"
/>
</template>
</el-table-column>
@ -344,17 +348,17 @@
>
<template #default="scope"> {{scope.row.standard && scope.row.standard.name}} </template>
</el-table-column>
<el-table-column label="标准值" prop="trialStandard" align="center" width="150px">
<template #default="scope">
<!-- <el-table-column label="标准值" prop="trialStandard" align="center" width="150px">
<template #default="scope"> -->
<!-- {{scope.row.standard && scope.row.standard.standardValue}}
{{'(' + scope.row.standard && scope.row.standard.downValue + '~' + scope.row.standard && scope.row.standard.upValue+ ')'}} -->
<span v-if="scope.row.standard">
<!-- <span v-if="scope.row.standard">
{{scope.row.standard.standardValue}}
<span v-if="scope.row.standard.downValue && scope.row.standard.upValue">{{'(' + scope.row.standard.downValue + '~' + scope.row.standard.upValue+ ')'}}</span>
</span>
<span v-else></span>
</template>
</el-table-column>
</el-table-column> -->
<!-- <el-table-column label="上下限" prop="trialStandard" align="center"></el-table-column>、
<el-table-column label="下限" prop="trialStandard" align="center"></el-table-column> -->
<el-table-column
@ -975,8 +979,8 @@ export default {
}
this.thicknessData.push({})
},
removeSpecimen(index,row){
if(row.checkUserRealName != null && row.checkUserRealName != ''){
removeSpecimen(index,row,val){
if(val.checkUserRealName != null && val.checkUserRealName != ''){
return
}
this.thicknessData.splice(index,1)

231
src/views/qualityManagement/reviewFormMess/index.vue
Unescape View File

@ -2,53 +2,81 @@
<template>
<basic-container>
<el-tabs v-model="tabPosition" class="demo-tabs" @tab-change="tabPositionChange">
<el-tab-pane label="erp审理" name="erpHear">
<avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
@row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad">
<template #menu-left>
</template>
<template #menu-right>
</template>
<template #menu="{ row }">
</template>
<el-tab-pane label="erp审理" name="erpHear"> </el-tab-pane>
<el-tab-pane label="内部审理" name="insideHear"> </el-tab-pane>
</el-tabs>
<div v-if="tabPosition == 'erpHear'">
<avue-crud
:option="option"
:table-loading="loading"
:data="data"
v-model="form"
v-model:page="page"
ref="crud"
@row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu-left> </template>
<template #menu-right> </template>
<template #menu="{ row }"> </template>
<template #heatTreat="scope">
<el-tag v-if="scope.row.afterPlating" type="success">是</el-tag>
<el-tag v-else type="warning">否</el-tag>
</template>
</avue-crud>
</el-tab-pane>
<el-tab-pane label="内部审理" name="insideHear">
<avue-crud :option="insideOption" :table-loading="loading" :data="insideData" v-model="form" v-model:page="insidePage" ref="crud"
@row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad">
<template #menu-left>
</template>
<template #menu-right>
</template>
<template #qty="{row}">
<span v-if="row.bizType == 1">{{row.reDoNum}}</span>
<span v-if="row.bizType == 2">{{row.scrapNum}}</span>
</div>
<div v-if="tabPosition == 'insideHear'">
<avue-crud
:option="insideOption"
:table-loading="loading"
:data="insideData"
v-model="form"
v-model:page="insidePage"
ref="crud"
@row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu-left> </template>
<template #menu-right> </template>
<template #qty="{ row }">
<span v-if="row.bizType == 1">{{ row.reDoNum }}</span>
<span v-if="row.bizType == 2">{{ row.scrapNum }}</span>
</template>
<template #menu="{ row }">
<el-button type="text" @click="reviewFn(row)" v-if="row.selfReviewFlag != 1 && row.selfReviewFlag != 2">审理</el-button>
<el-button
type="text"
@click="reviewFn(row)"
v-if="row.selfReviewFlag != 1 && row.selfReviewFlag != 2"
>审理</el-button
>
</template>
</avue-crud>
</el-tab-pane>
</el-tabs>
<reviewDialog v-if="isReviewOpen" :id="checkId" :showDialog="isReviewOpen" @closeDialog="closeDialog"></reviewDialog>
</div>
<reviewDialog
v-if="isReviewOpen"
:id="checkId"
:showDialog="isReviewOpen"
@closeDialog="closeDialog"
></reviewDialog>
</basic-container>
</template>
<script>
import reviewDialog from "@/views/qualityManagement/reworkOrderReview/components/reviewDialog.vue"
import reviewDialog from '@/views/qualityManagement/reworkOrderReview/components/reviewDialog.vue';
import {
add,
getRole,
@ -61,19 +89,22 @@ import {
} from '@/api/system/role';
import { mapGetters } from 'vuex';
import { validatenull } from '@/utils/validate';
import {insideOption,erpOption} from './options'
import {getInnerReviewList,getErpReviewList} from "@/api/qualityManagement/productionTesting/reviewFormMess"
import { insideOption, erpOption } from './options';
import {
getInnerReviewList,
getErpReviewList,
} from '@/api/qualityManagement/productionTesting/reviewFormMess';
export default {
components: {
reviewDialog
reviewDialog,
},
data() {
return {
checkId:'',
insideQuery:{},
isReviewOpen:false,
tabPosition:'erpHear',
checkId: '',
insideQuery: {},
isReviewOpen: false,
tabPosition: 'erpHear',
inBatchesOpen: false,
platingSmallOpen: false,
planOrderArr: [],
@ -102,60 +133,62 @@ export default {
total: 0,
},
option: erpOption,
insideOption:insideOption,
insideOption: insideOption,
data: [],
isRushOpen: false,//加急弹框
isBatchOpen: false,//分批处理
insideData:[],
insidePage:{
isRushOpen: false, //加急弹框
isBatchOpen: false, //分批处理
insideData: [],
insidePage: {
pageSize: 10,
currentPage: 1,
total: 0,
}
},
};
},
methods: {
tabPositionChange(val){
this.tabPosition = val
if(this.tabPosition == 'erpHear'){
this.getErpList()
}else if(this.tabPosition == 'insideHear'){
this.getInsideList()
tabPositionChange(val) {
this.tabPosition = val;
if (this.tabPosition == 'erpHear') {
this.getErpList();
} else if (this.tabPosition == 'insideHear') {
this.getInsideList();
}
},
reviewFn(row){
this.checkId = row.id
this.isReviewOpen = true
reviewFn(row) {
this.checkId = row.id;
this.isReviewOpen = true;
},
getErpList(){
getErpList() {
this.loading = true;
getErpReviewList({
current:this.page.currentPage,
size:this.page.pageSize,
...this.query
}).then(res =>{
this.data = res.data.data.records
this.page.total = res.data.data.total
this.loading = false
})
current: this.page.currentPage,
size: this.page.pageSize,
...this.query,
}).then(res => {
this.data = res.data.data.records;
this.page.total = res.data.data.total;
this.loading = false;
});
},
getInsideList(){
if(this.insideQuery.crDate){
delete this.insideQuery.crDate
getInsideList() {
this.loading = true;
if (this.insideQuery.crDate) {
delete this.insideQuery.crDate;
}
if(this.insideQuery.reviewDate){
delete this.insideQuery.reviewDate
if (this.insideQuery.reviewDate) {
delete this.insideQuery.reviewDate;
}
getInnerReviewList({
current:this.insidePage.currentPage,
size:this.insidePage.pageSize,
current: this.insidePage.currentPage,
size: this.insidePage.pageSize,
// bizType:0,
...this.insideQuery
}).then(res =>{
this.insideData = res.data.data.records
this.insidePage.total = res.data.data.total
})
...this.insideQuery,
}).then(res => {
this.loading = false;
this.insideData = res.data.data.records;
this.insidePage.total = res.data.data.total;
});
},
// 批量接收
batchReceiving() {
@ -195,14 +228,14 @@ export default {
},
// 加急
rushFn() {
this.isRushOpen = true
this.isRushOpen = true;
},
closeDialog(val) {
this.isRushOpen = false
this.isBatchOpen = false
this.isReviewOpen = false
if(val){
this.tabPositionChange('insideHear')
this.isRushOpen = false;
this.isBatchOpen = false;
this.isReviewOpen = false;
if (val) {
this.tabPositionChange('insideHear');
}
},
inBatchesFn(row) {
@ -296,34 +329,37 @@ export default {
},
searchReset() {
if(this.tabPosition == 'erpHear'){
this.query = {}
this.getErpList()
}else if(this.tabPosition == 'insideHear'){
this.insideQuery = {}
this.getInsideList()
if (this.tabPosition == 'erpHear') {
this.query = {};
this.getErpList();
} else if (this.tabPosition == 'insideHear') {
this.insideQuery = {};
this.getInsideList();
}
// this.query = {};
// this.onLoad(this.page);
},
searchChange(params, done) {
console.log('tab---------',this.tabPosition)
if(this.tabPosition == 'erpHear'){
console.log('tab---------', this.tabPosition);
if (this.tabPosition == 'erpHear') {
this.query = params;
this.page.currentPage = 1;
this.getErpList();
done();
}else if(this.tabPosition == 'insideHear'){
} else if (this.tabPosition == 'insideHear') {
this.insideQuery = params;
this.insideQuery.createTimeStart = params.crDate && params.crDate.length != 0 && params.crDate[0]
this.insideQuery.createTimeEnd = params.crDate && params.crDate.length != 0 && params.crDate[1]
this.insideQuery.reviewTimeStart = params.reviewDate && params.reviewDate.length != 0 && params.reviewDate[1]
this.insideQuery.reviewTimeEnd = params.reviewDate && params.reviewDate.length != 0 && params.reviewDate[1]
this.insideQuery.createTimeStart =
params.crDate && params.crDate.length != 0 && params.crDate[0];
this.insideQuery.createTimeEnd =
params.crDate && params.crDate.length != 0 && params.crDate[1];
this.insideQuery.reviewTimeStart =
params.reviewDate && params.reviewDate.length != 0 && params.reviewDate[1];
this.insideQuery.reviewTimeEnd =
params.reviewDate && params.reviewDate.length != 0 && params.reviewDate[1];
this.insidePage.currentPage = 1;
this.getInsideList();
done();
}
},
selectionChange(list) {
this.selectionList = list;
@ -426,7 +462,7 @@ export default {
},
onLoad(page, params = {}) {
this.getErpList()
this.getErpList();
// this.loading = true;
// this.data = [
@ -440,7 +476,6 @@ export default {
// // });
},
},
mounted() {
}
mounted() {},
};
</script>

Write Preview
Loading…
Cancel
Save