Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

Browse Source
master
zhaoxiaolin 8 months ago
parent 9acac16994
commit 8345bfbe04
5 changed files with 202 additions and 18 deletions
Show Stats Download Patch File Download Diff File

5
src/api/quality/produceReport.js
Unescape Escape View File

@ -43,9 +43,10 @@ export function delProduce(recordId) {
}); });
} }
export function getProduceReportXJ(orderNo) { export function getProduceReportXJ(orderNo,shiftId) {
const data = { const data = {
orderNo orderNo,
shiftId
} }
return request({ return request({
url: '/quality/qcProduceReport/getProduceReportXJ', url: '/quality/qcProduceReport/getProduceReportXJ',

4
src/views/plan/workorderBP/index.vue
Unescape Escape View File

@ -1322,8 +1322,8 @@ export default {
var statusesArray = this.statuses; var statusesArray = this.statuses;
for (var i = 0; i < statusesArray.length; i++) { for (var i = 0; i < statusesArray.length; i++) {
if (statusesArray[i] != 'w0') {//已经下达的不允许操作 if (statusesArray[i] == 'w2') {
this.$modal.msgError("已经派发的订单不允许操作"); this.$modal.msgError("已经活动的订单不允许操作");
return return
} }
} }

184
src/views/quality/produceReport/index.vue
Unescape Escape View File

@ -183,7 +183,7 @@
</el-radio-group> </el-radio-group>
</el-col> </el-col>
</el-row> </el-row>
<!-- 主数据 --> <!-- 主数据 （白班）-->
<el-table <el-table
v-if="refreshNewWorkerTable" v-if="refreshNewWorkerTable"
v-loading="newWorkerLoading" v-loading="newWorkerLoading"
@ -360,6 +360,165 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table
v-if="refreshNewWorkerTableNight"
v-loading="newWorkerLoading"
class="my-print-table"
:data="form.checkInfos"
border
style="width: 100%">
<el-table-column label="id" align="center" prop="recordId" v-if="false"/>
<el-table-column label="序号" type="index" align="center" :index="indexMethod"/>
<el-table-column label="项目名称" width="155" align="left" prop="ruleName" />
<el-table-column label="时间" align="center" >
<el-table-column prop="column080090" label="20:30-21:30" width="95" align="center">
<template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column080090.split(',')">
<el-image
:src="item"
style="width: 60px; height: 60px"
:fit="fit"
:preview-src-list="Array.from(scope.row.column080090.split(',')).slice(1)"
v-if="index>0"/>
<span v-else>{{item}}</span>
</div>
</template>
</el-table-column>
<el-table-column prop="column090100" label="21:30-22:30" width="95" align="center">
<template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column090100.split(',')">
<el-image
:src="item"
style="width: 60px; height: 60px"
:fit="fit"
:preview-src-list="Array.from(scope.row.column090100.split(',')).slice(1)"
v-if="index>0"/>
<span v-else>{{item}}</span>
</div>
</template>
</el-table-column>
<el-table-column prop="column100110" label="22:30-23:30" width="95" align="center">
<template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column100110.split(',')">
<el-image
:src="item"
style="width: 60px; height: 60px"
:fit="fit"
:preview-src-list="Array.from(scope.row.column100110.split(',')).slice(1)"
v-if="index>0"/>
<span v-else>{{item}}</span>
</div>
</template>
</el-table-column>
<el-table-column prop="column110120" label="23:30-1:30" width="95" align="center">
<template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column110120.split(',')">
<el-image
:src="item"
style="width: 60px; height: 60px"
:fit="fit"
:preview-src-list="Array.from(scope.row.column110120.split(',')).slice(1)"
v-if="index>0"/>
<span v-else>{{item}}</span>
</div>
</template>
</el-table-column>
<el-table-column prop="column133143" label="1:30-2:30" width="95" align="center">
<template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column133143.split(',')">
<el-image
:src="item"
style="width: 60px; height: 60px"
:fit="fit"
:preview-src-list="Array.from(scope.row.column133143.split(',')).slice(1)"
v-if="index>0"/>
<span v-else>{{item}}</span>
</div>
</template>
</el-table-column>
<el-table-column prop="column143153" label="2:30-3:30" width="95" align="center">
<template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column143153.split(',')">
<el-image
:src="item"
style="width: 60px; height: 60px"
:fit="fit"
:preview-src-list="Array.from(scope.row.column143153.split(',')).slice(1)"
v-if="index>0"/>
<span v-else>{{item}}</span>
</div>
</template>
</el-table-column>
<el-table-column prop="column153163" label="3:30-4:30" width="95" align="center">
<template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column153163.split(',')">
<el-image
:src="item"
style="width: 60px; height: 60px"
:fit="fit"
:preview-src-list="Array.from(scope.row.column153163.split(',')).slice(1)"
v-if="index>0"/>
<span v-else>{{item}}</span>
</div>
</template>
</el-table-column>
<el-table-column prop="column163173" label="4:30-5:30" width="95" align="center">
<template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column163173.split(',')">
<el-image
:src="item"
style="width: 60px; height: 60px"
:fit="fit"
:preview-src-list="Array.from(scope.row.column163173.split(',')).slice(1)"
v-if="index>0"/>
<span v-else>{{item}}</span>
</div>
</template>
</el-table-column>
<el-table-column prop="column123133" label="5:30-6:30" width="95" align="center">
<template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column123133.split(',')">
<el-image
:src="item"
style="width: 60px; height: 60px"
:fit="fit"
:preview-src-list="Array.from(scope.row.column123133.split(',')).slice(1)"
v-if="index>0"/>
<span v-else>{{item}}</span>
</div>
</template>
</el-table-column>
<el-table-column prop="column180190" label="6:30-7:30" width="95" align="center">
<template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column180190.split(',')">
<el-image
:src="item"
style="width: 60px; height: 60px"
:fit="fit"
:preview-src-list="Array.from(scope.row.column180190.split(',')).slice(1)"
v-if="index>0"/>
<span v-else>{{item}}</span>
</div>
</template>
</el-table-column>
<el-table-column prop="column190200" label="7:30-8:30" width="95" align="center">
<template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column190200.split(',')">
<el-image
:src="item"
style="width: 60px; height: 60px"
:fit="fit"
:preview-src-list="Array.from(scope.row.column190200.split(',')).slice(1)"
v-if="index>0"/>
<span v-else>{{item}}</span>
</div>
</template>
</el-table-column>
</el-table-column>
</el-table>
<br/> <br/>
<!-- 底部 --> <!-- 底部 -->
<el-row class="my-print-foot"> <el-row class="my-print-foot">
@ -543,6 +702,7 @@ export default {
formRef: 'form', formRef: 'form',
newWorkerLoading: false, newWorkerLoading: false,
refreshNewWorkerTable:true, refreshNewWorkerTable:true,
refreshNewWorkerTableNight:true,
validateRules: [], validateRules: [],
checkList: [], checkList: [],
standardNo: null, standardNo: null,
@ -760,18 +920,32 @@ export default {
this.queryParams.recordId = recordId; this.queryParams.recordId = recordId;
this.getCheckedProjectList(); this.getCheckedProjectList();
}else { }else {
const orderNo = row.orderNo; const orderNo = row.orderNo;
getProduceReportXJ(orderNo).then(response => { if(row.shiftId == '5'){
getProduceReportXJ(orderNo,row.shiftId).then(response => {
this.form = response; this.form = response;
//巡检报告 //巡检报告
this.form.printable = 'printForm'; //打印时需要 this.form.printable = 'printForm'; //打印时需要
this.form.ignore = ['no-print'];//打印时需要 this.form.ignore = ['no-print'];//打印时需要
this.open = true; this.open = true;
this.title = "巡检检验报告"; this.title = "巡检检验报告";
this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格 this.refreshNewWorkerTable = true ;// 立即将refreshProTable设置为true，显示表格
this.newWorkerLoading = false // 设置加载状态为false，表示加载完成 this.refreshNewWorkerTableNight = false ;
this.newWorkerLoading = false ;// 设置加载状态为false，表示加载完成
}) })
}else if(row.shiftId == '2'){
getProduceReportXJ(orderNo,row.shiftId).then(response => {
this.form = response;
//巡检报告
this.form.printable = 'printForm'; //打印时需要
this.form.ignore = ['no-print'];//打印时需要
this.open = true;
this.title = "巡检检验报告";
this.refreshNewWorkerTableNight = true ;// 立即将refreshProTable设置为true，显示表格
this.refreshNewWorkerTable = false ;
this.newWorkerLoading = false ;// 设置加载状态为false，表示加载完成
})
}
} }
}, },

9
src/views/quality/qcIncome/index.vue
Unescape Escape View File

@ -141,7 +141,9 @@
</el-table-column> </el-table-column>
<el-table-column label="来料批次号" align="center" prop="incomeBatchNo" width="120"/> <el-table-column label="来料批次号" align="center" prop="incomeBatchNo" width="120"/>
<el-table-column label="订单号" align="center" prop="orderNo" width="120"/> <el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
<el-table-column label="物料号" align="center" prop="materialCode" width="170"/> <el-table-column label="物料号" align="center" prop="materialCode" width="170"
:formatter="productCodeFormate"
/>
<el-table-column label="物料名称" align="center" prop="materialName" width="150"/> <el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
<el-table-column label="收货数量" align="center" prop="quality" /> <el-table-column label="收货数量" align="center" prop="quality" />
<el-table-column label="不合格数量" align="center" prop="noOkQuality" width="120"/> <el-table-column label="不合格数量" align="center" prop="noOkQuality" width="120"/>
@ -470,6 +472,11 @@ export default {
this.handleDefectType(); this.handleDefectType();
}, },
methods: { methods: {
productCodeFormate(row, column, cellValue){
if(cellValue != null){
return cellValue.slice(7,18); //返回值
}
},
/****/ /****/
getCheckTypes() { getCheckTypes() {
getCheckTypes('material').then(response => { getCheckTypes('material').then(response => {

2
src/views/quality/qcProduce/index.vue
Unescape Escape View File

@ -563,7 +563,9 @@ export default {
methods: { methods: {
//产品编码格式化 //产品编码格式化
productCodeFormate(row, column, cellValue){ productCodeFormate(row, column, cellValue){
if(cellValue != null){
return cellValue.slice(7,18); //返回值 return cellValue.slice(7,18); //返回值
}
}, },
/****/ /****/
//获取检验节点 //获取检验节点

Write Preview
Loading…
Cancel
Save