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

问题修改

Browse Source
dev-scheduling
jinna 2 days ago
parent daa130c577
commit e179bdd76b
4 changed files with 71 additions and 28 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/api/qualityManagement/productionTesting/productionQuality.js
  2. 79
      src/views/productionTesting/productionQuality.vue
  3. 4
      src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue
  4. 7
      src/views/qualityManagement/tankSolutionSystem/components/batchDialog.vue

9
src/api/qualityManagement/productionTesting/productionQuality.js
Unescape View File

@ -142,4 +142,13 @@ export const getParamRemind = (data) =>{
method:'post',
data
})
}
// 获取零件子件
export const getPartChild = (params) =>{
return request({
url:'/api/blade-desk/dsPart/detail',
method:'get',
params
})
}

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

@ -180,6 +180,9 @@
</template>
</el-table-column>
<el-table-column label="镀前镀后" prop="testType" align="center">
<template #header>
<span><i style="color: red">*</i>镀前镀后</span>
</template>
<template #default="scope1">
<!-- <el-input v-model="scope1.row.testType"
:disabled="scope.row.checkUserRealName != null && scope.row.checkUserRealName != '' "
@ -241,6 +244,9 @@
</template>
</el-table-column> -->
<el-table-column label="测量值1" prop="gaugeValue1" align="center">
<template #header>
<span><i style="color: red">*</i>镀前镀后</span>
</template>
<template #default="scope1">
<el-input v-model="scope1.row.gaugeValue1" :disabled="scope.row.checkUserRealName != null && scope.row.checkUserRealName != '' "></el-input>
</template>
@ -502,23 +508,31 @@
</template>
</el-table-column>
</el-table>
<!-- -->
<el-descriptions v-if="dialogData.ppsName == '烧结包装防护'" title="子件" :column="5" border style="margin-top: 24px"></el-descriptions>
<!-- v-if="dialogData.ppsName == '烧结包装防护'" -->
<el-descriptions title="子件" :column="5" border style="margin-top: 24px"></el-descriptions>
<!-- v-if="dialogData.ppsName == '烧结包装防护'" -->
<el-table :data="vxeTableData1" show-overflow-tooltip>
<el-table-column label="子件号" prop="partCode" align="center"></el-table-column>
<el-table-column label="子件名称" prop="partName" align="center"></el-table-column>
<el-table-column label="数量" prop="qty" align="center"></el-table-column>
<el-table-column label="数量" prop="quota" align="center"></el-table-column>
<el-table-column label="产品型号" prop="productType" align="center"></el-table-column>
<el-table-column label="子件类型" prop="sinTerType" align="center"></el-table-column>
<el-table-column label="子件类型" prop="sinTerType" align="center">
<template #default="scope">
<span v-if="scope.row.sinTerType == 1">插针</span>
<span v-if="scope.row.sinTerType == 2">壳体</span>
<span v-if="scope.row.sinTerType == 5">石墨模</span>
<span v-if="scope.row.sinTerType == 3">自制玻璃饼</span>
<span v-if="scope.row.sinTerType == 4">其他</span>
</template>
</el-table-column>
<el-table-column label="镀种" prop="plate" align="center"></el-table-column>
<el-table-column label="材料" prop="material" align="center"></el-table-column>
<el-table-column label="面积(d㎡)" prop="area" align="center"></el-table-column>
<el-table-column label="总面积(d㎡)" prop="totalArea" align="center"> </el-table-column>
<el-table-column label="镀层代码" prop="matCode" align="center"></el-table-column>
<el-table-column label="镀层代码" prop="plateCode" align="center"></el-table-column>
<el-table-column label="镀层厚度" prop="plateThickness" align="center"></el-table-column>
<el-table-column label="备注" prop="remarks" align="center"></el-table-column>
<el-table-column label="修改人" prop="lastUpdateUser" align="center"></el-table-column>
<el-table-column label="修改人" prop="updateUserStr" align="center"></el-table-column>
</el-table>
<template #footer>
@ -540,7 +554,7 @@
<script>
import {dateFormat} from '@/utils/date'
import {createInspection,getInspectionList,getInspectionDetail,fillInspection,getSameLotList,applySameLot,
refreshHardness,getThicknessList,goQualityRecord,goCertificate,getSubPackageList, getSupplierList,getMeasurement,
refreshHardness,getThicknessList,goQualityRecord,goCertificate,getSubPackageList,getPartChild, getSupplierList,getMeasurement,
getCodeRemind,getParamRemind} from '@/api/qualityManagement/productionTesting/productionQuality.js'
import sametankView from './components/sametankView.vue';
import { mapGetters } from 'vuex';
@ -1513,19 +1527,27 @@ export default {
item.wpItemDetailList = [...this.thicknessData]
}
})
console.log('detailInfo------------------',this.detailInfo)
fillInspection(this.detailInfo).then(res =>{
if(res.data.code == 200){
this.$message.success('保存成功')
this.showDialog = false
this.isStart = false
this.getDChyData = []
clearInterval(this.ydInterval)
clearInterval(this.firstInterval)
clearInterval(this.secondInderval)
this.onLoad()
let ruleTmp = this.detailInfo.wpItemList.find(item => item.item.name == '尺寸检测')
if(ruleTmp){
let tmp = ruleTmp.wpItemDetailList.find(item => !item.actMtId || !item.testType || !item.gaugeValue1)
if(tmp){
this.$message.error('尺寸信息请补充完整')
return
}
})
}
console.log('detailInfo------------------',this.detailInfo)
// fillInspection(this.detailInfo).then(res =>{
// if(res.data.code == 200){
// this.$message.success('保存成功')
// this.showDialog = false
// this.isStart = false
// this.getDChyData = []
// clearInterval(this.ydInterval)
// clearInterval(this.firstInterval)
// clearInterval(this.secondInderval)
// this.onLoad()
// }
// })
},
// 点击应用按钮
@ -1720,11 +1742,20 @@ export default {
// if(this.dialogData.ppsName === '烧结包装防护'){
getSubPackageList({
yoId:res.data.data.orderInfo.yoId
}).then(res3 =>{
this.vxeTableData1 = res3.data.data
console.log('vxeTableData1------------------',this.vxeTableData1)
// getSubPackageList({
// yoId:res.data.data.orderInfo.yoId
// }).then(res3 =>{
// this.vxeTableData1 = res3.data.data
// console.log('vxeTableData1------------------',this.vxeTableData1)
// })
getPartChild({
partCode:this.dialogData.partCode,
partVersion:1,
rank:2
}).then(res =>{
console.log('res-------------',res)
this.vxeTableData1 = res.data.data.dsPartVOList
})
// }
console.log('vxeTableData-------------',this.vxeTableData)

4
src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue
Unescape View File

@ -145,8 +145,8 @@
</tr>
<tr v-if="item.deviceCode && item.deviceCode != ''">
<td colspan="1">设备编号</td>
<td colspan="4">{{item.deviceCode || '/'}}</td>
<td colspan="1">有效期</td>
<td colspan="3">{{item.deviceCode || '/'}}</td>
<td colspan="2">有效期</td>
<td colspan="3">/</td>
</tr>
<tr v-if="item.slotList && item.slotList.length>0">

7
src/views/qualityManagement/tankSolutionSystem/components/batchDialog.vue
Unescape View File

@ -83,7 +83,7 @@
</template>
<template #needAddValue="scope">
<div class="inpu-text">
<el-input style="margin-top:9px;" @input="val => scope.row.needAddValue = formatDecimal(val, 5)" :disabled="scope.row.status == 8 || scope.row.status == 2 || scope.row.status == 4" v-model="scope.row.needAddValue" />
<el-input style="margin-top:9px;" @input="val => scope.row.needAddValue = formatDecimal(val, 5)" disabled v-model="scope.row.needAddValue" />
<i>({{scope.row.liquidTank.addUnit}})</i>
</div>
</template>
@ -96,7 +96,7 @@
<!-- 复测测量值 -->
<template #repeatTestValue="scope">
<div class="inpu-text">
<el-input style="margin-top:9px;" @input="val => scope.row.repeatTestValue = formatDecimal(val, 5)" :disabled="scope.row.status == 2 || scope.row.status == 4" v-model="scope.row.repeatTestValue" />
<el-input style="margin-top:9px;" @input="val => scope.row.repeatTestValue = formatDecimal(val, 5)" :disabled="scope.row.status == 2 || scope.row.status == 4 || scope.row.status == 12" v-model="scope.row.repeatTestValue" />
<i>({{scope.row.liquidTank.testUnit}})</i>
</div>
</template>
@ -541,6 +541,9 @@ export default {
},
// 暂存
handleSave(){
this.data.map(item => {
item.firstTestDate = item.firstTestDate ? item.firstTestDate : ''
})
saveDrugBat(this.data).then(res =>{
if(res.data.code == 200){
this.$message.success('暂存成功')

Write Preview
Loading…
Cancel
Save