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

Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

Browse Source
dev-scheduling
zhangdi 1 month ago
parent 4d581174d3 390e99181d
commit 8b39d13ce8
14 changed files with 211 additions and 167 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. 10
      public/config.js
  2. 2
      src/api/outsourcingManagement/performanceApplication.js
  3. 22
      src/api/qualityManagement/productionTesting/productionQuality.js
  4. 20
      src/views/inboundOutboundManagement/pickListPrinting.vue
  5. 20
      src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
  6. 9
      src/views/oem/oemOrderSettlement/components/settlementCompleted.vue
  7. 3
      src/views/oem/oemOrderSettlement/components/settlementIn.vue
  8. 9
      src/views/oem/oemOrderSettlement/components/unsettled.vue
  9. 18
      src/views/oem/performanceApplication/components/addQuality.vue
  10. 229
      src/views/productionTesting/productionQuality.vue
  11. 6
      src/views/qualityManagement/inspectionArchiving/ERecord/index.vue
  12. 20
      src/views/qualityManagement/tankSolutionSystem/inspectionReport.vue
  13. 3
      src/views/qualityManagement/tankSolutionSystem/workTankLine.vue
  14. 7
      src/views/statisticalAnalysis/warehouseAnalysis/inventorySummary.vue

10
public/config.js
Unescape View File

@ -14,4 +14,12 @@ window.PROCESS_QUALITY_RECORD = "http://192.168.169.172:9000/jmreport/view/11531
window.WARE_MATERIAL_STOCK = "http://192.168.169.172:9000/jmreport/view/1186917825215324160" //仓管-库存汇总-存料登记卡打印
// 配套单打印
window.COMPANION = "http://192.168.169.172:9000/jmreport/view/1188705683594706944"
window.COMPANION = "http://192.168.169.172:9000/jmreport/view/1188705683594706944"
// 领料单打印
window.WARE_MATERIAL_PRINT = "http://192.168.169.172:9000/jmreport/view/1181486341205573632"
// 领料单明细打印
// 库存汇总标签打印
window.WARE_MATERIAL_STOCK_TAG = "http://192.168.169.172:9000/jmreport/view/1181492297180168192"

2
src/api/outsourcingManagement/performanceApplication.js
Unescape View File

@ -13,7 +13,7 @@ export const getList = params => {
// 外协绩效申请
export const performanceApply = data => {
return request({
url: '/api/blade-desk/mesOemMerits/submit',
url: '/api/blade-desk/mesOemMerits/applyOemMerits',
method: 'post',
data
});

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

@ -76,7 +76,7 @@ export const getHardnessList = (params) => {
// 刷新硬度数据
export const refreshHardness = (params) => {
return request({
url: '/api/blade-desk/QA/IotHardness/getDataRefresh',
url: '/api/blade-desk/QA/IotHardness/queryHardnessData',
method: 'get',
params
});
@ -92,18 +92,18 @@ export const getThicknessList = (params) => {
};
// 质量记录跳转
export const goQualityRecord = (params) => {
export const goQualityRecord = (data) => {
return request({
url: '/api/blade-desk/QA/InspectionTask/toQaRecord',
method: 'get',
params
url: '/api/blade-desk/QA/InspectionTask/reviewQualityRecords',
method: 'post',
data
});
};
// 合格证跳转
export const goCertificate = (params) => {
return request({
url: '/api/blade-desk/QA/InspectionTask/toCertificate',
url: '/api/blade-desk/QA/reviewQualification',
method: 'get',
params
});
@ -116,4 +116,12 @@ export const getSubPackageList = (params) => {
method: 'get',
params
});
};
};
// 获取量具下拉列表
export const getMeasurement = () =>{
return request({
url:"/api/blade-desk/measurementRecords/listResult",
method:"get"
})
}

20
src/views/inboundOutboundManagement/pickListPrinting.vue
Unescape View File

@ -23,10 +23,10 @@
<!-- <el-button type="text" @click="showDetail(scope.row)">详情</el-button> -->
</template>
<template #menu-left>
<el-button type="primary" :disabled="selectionList.length == 0" @click="printRequisition"
<el-button type="primary" :disabled="selectionList.length == 0 || selectionList.length > 1" @click="printRequisition"
>领用单打印</el-button
>
<el-button type="primary" :disabled="selectionList.length == 0"
<el-button type="primary" :disabled="selectionList.length == 0 || selectionList.length > 1" @click="printDetail"
>领用单明细打印</el-button
>
</template>
@ -2320,12 +2320,16 @@ export default {
this.onLoad()
},
printRequisition(){
getRequisition({
idList:this.selectionList.map(item=>item.id).join(","),
exportType:1
}).then(rse =>{
console.log('res--------------',res)
})
window.open(window.WARE_MATERIAL_PRINT+'?id='+this.selectionList[0].id);
// getRequisition({
// idList:this.selectionList.map(item=>item.id).join(","),
// exportType:1
// }).then(rse =>{
// console.log('res--------------',res)
// })
},
printDetail(){
window.open(window.WARE_MATERIAL_PRINT_DETAIL+'?id='+this.selectionList[0].id);
},
onLoad() {
getList({

20
src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
Unescape View File

@ -5,9 +5,9 @@
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad">
<template #menu-left>
<el-form ref="form" :model="form" label-width="100px" :inline="true">
<el-form ref="form" :model="formValue" label-width="100px" :inline="true">
<el-form-item label="现执行价格:">
<el-input v-model="form.name"></el-input>
<el-input v-model="formValue.name"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="settlementFn">结算</el-button>
@ -35,6 +35,9 @@ export default {
data() {
return {
selectionList: [],
data:[],
loading:false,
query:{},
option: {
height: 'auto',
calcHeight: 32,
@ -189,7 +192,7 @@ export default {
},
{
label: '镀后入库时间',
prop: 'workCenterNames',
prop: 'duhoutime',
sortable: true,
filter: true,
span: 24,
@ -338,9 +341,8 @@ export default {
]
},
form: {
},
form: {},
formValue:{},
page: {
pageSize: 10,
currentPage: 1,
@ -467,9 +469,9 @@ export default {
]
this.page.total = this.data.length
this.loading = false
setTimeout(() => {
this.selectionClear()
}, 500)
// setTimeout(() => {
// this.selectionClear()
// }, 500)
}
}
}

9
src/views/oem/oemOrderSettlement/components/settlementCompleted.vue
Unescape View File

@ -24,6 +24,9 @@ export default {
data() {
return {
selectionList: [],
data:[],
loading:false,
query:{},
option: {
height: 'auto',
calcHeight: 32,
@ -508,9 +511,9 @@ export default {
]
this.page.total = this.data.length
this.loading = false
setTimeout(() => {
this.selectionClear()
}, 500)
// setTimeout(() => {
// this.selectionClear()
// }, 500)
}
}
}

3
src/views/oem/oemOrderSettlement/components/settlementIn.vue
Unescape View File

@ -27,6 +27,9 @@ export default {
data() {
return {
selectionList: [],
data:[],
loading:false,
query:{},
option: {
height: 'auto',
calcHeight: 32,

9
src/views/oem/oemOrderSettlement/components/unsettled.vue
Unescape View File

@ -37,6 +37,9 @@ export default {
data() {
return {
selectionList: [],
data:[],
loading:false,
query:{},
option: {
height: 'auto',
calcHeight: 32,
@ -446,9 +449,9 @@ export default {
]
this.page.total = this.data.length
this.loading = false
setTimeout(() => {
this.selectionClear()
}, 500)
// setTimeout(() => {
// this.selectionClear()
// }, 500)
}
}
}

18
src/views/oem/performanceApplication/components/addQuality.vue
Unescape View File

@ -501,20 +501,20 @@ export default {
console.log('111111111111')
this.$refs.form.validate(valid => {
if (valid) {
this.data.map(item =>{
item.ocId = parseInt(item.ocId)
})
// this.data.map(item =>{
// item.ocId = parseInt(item.ocId)
// })
let params = {
date:this.submitForm.date,
oemMeritsEntities:this.data
}
console.log('param---------',params)
// performanceApply(params).then(res =>{
// if(res.data.code == 200){
// this.$message.success('申请成功')
// this.closeDialog(true)
// }
// })
performanceApply(params).then(res =>{
if(res.data.code == 200){
this.$message.success('申请成功')
this.closeDialog(true)
}
})
}
})

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

@ -102,7 +102,8 @@
</el-form-item> -->
</el-col>
<el-col :span="17">
<div style="float: right;">
<div style="float: right;display: flex;align-items: center;">
<el-checkbox style="color:#284c89;margin-right:10px;font-seze:14px;">同步同炉/同槽</el-checkbox>
<el-button
@click="gainYDValue"
link
@ -140,61 +141,62 @@
<el-table
:data="scope.row.wpItemDetailList"
show-overflow-tooltip
v-if="scope.row.item.specialType == 3"
v-if="scope.row.item.specialType == 3 && scope.row.wpItemDetailList.length > 0"
style="margin: 12px"
>
<el-table-column label="镀前镀后" prop="testType" align="center"></el-table-column>
<el-table-column label="尺寸" prop="ruleSize" align="center"></el-table-column>
<el-table-column label="量具" prop="mtId" align="center">
<el-table-column label="量具" prop="tools" align="center">
<template #default="scope">
{{scope.row.mtName}}
</template>
</el-table-column>
<el-table-column label="量具编号" prop="trialNo" align="center">
<template #default="scope">
<el-select v-model="scope.row.actMtId" placeholder="请输入" :disabled="scope.row.checkUserRealName != ''">
<el-option label="量具1" value="1" />
<template #default="scope1">
<!-- {{scope.row}} -->
<el-select v-model="scope1.row.actMtId" placeholder="请输入" :disabled="scope.row.checkUserRealName != ''">
<el-option v-for="item in measureList" :key="item.id" :label="item.mcName" :value="item.id" />
</el-select>
</template>
</el-table-column>
<el-table-column label="测量值1" prop="gaugeValue1" align="center">
<template #default="scope">
<el-input v-model="scope.row.gaugeValue1" :disabled="scope.row.checkUserRealName != ''"></el-input>
<template #default="scope1">
<el-input v-model="scope1.row.gaugeValue1" :disabled="scope.row.checkUserRealName != ''"></el-input>
</template>
</el-table-column>
<el-table-column label="测量值2" prop="gaugeValue2" align="center">
<template #default="scope">
<el-input v-model="scope.row.gaugeValue2" :disabled="scope.row.checkUserRealName != ''"></el-input>
<template #default="scope1">
<el-input v-model="scope1.row.gaugeValue2" :disabled="scope.row.checkUserRealName != ''"></el-input>
</template>
</el-table-column>
<el-table-column label="测量值3" prop="gaugeValue3" align="center">
<template #default="scope">
<el-input v-model="scope.row.gaugeValue3" :disabled="scope.row.checkUserRealName != ''"></el-input>
<template #default="scope1">
<el-input v-model="scope1.row.gaugeValue3" :disabled="scope.row.checkUserRealName != ''"></el-input>
</template>
</el-table-column>
<el-table-column label="测量值4" prop="gaugeValue4" align="center">
<template #default="scope">
<el-input v-model="scope.row.gaugeValue4" :disabled="scope.row.checkUserRealName != ''"></el-input>
<template #default="scope1">
<el-input v-model="scope1.row.gaugeValue4" :disabled="scope.row.checkUserRealName != ''"></el-input>
</template>
</el-table-column>
<el-table-column label="测量值5" prop="gaugeValue5" align="center">
<template #default="scope">
<el-input v-model="scope.row.gaugeValue5" :disabled="scope.row.checkUserRealName != ''"></el-input>
<template #default="scope1">
<el-input v-model="scope1.row.gaugeValue5" :disabled="scope.row.checkUserRealName != ''"></el-input>
</template>
</el-table-column>
<el-table-column label="测量值6" prop="gaugeValue6" align="center">
<template #default="scope">
<el-input v-model="scope.row.gaugeValue6" :disabled="scope.row.checkUserRealName != ''"></el-input>
<template #default="scope1">
<el-input v-model="scope1.row.gaugeValue6" :disabled="scope.row.checkUserRealName != ''"></el-input>
</template>
</el-table-column>
<el-table-column label="测量值7" prop="gaugeValue7" align="center">
<template #default="scope">
<el-input v-model="scope.row.gaugeValue7" :disabled="scope.row.checkUserRealName != ''"></el-input>
<template #default="scope1">
<el-input v-model="scope1.row.gaugeValue7" :disabled="scope.row.checkUserRealName != ''"></el-input>
</template>
</el-table-column>
<el-table-column label="测量值8" prop="gaugeValue8" align="center">
<template #default="scope">
<el-input v-model="scope.row.gaugeValue8" :disabled="scope.row.checkUserRealName != ''"></el-input>
<template #default="scope1">
<el-input v-model="scope1.row.gaugeValue8" :disabled="scope.row.checkUserRealName != ''"></el-input>
</template>
</el-table-column>
</el-table>
@ -367,22 +369,22 @@
</template>
</el-table-column>
</el-table>
<!-- v-if="dialogData.ppsName == '烧结包装防护'" -->
<el-descriptions title="子件" :column="5" border style="margin-top: 24px"></el-descriptions>
<el-table :data="vxeTableData1" show-overflow-tooltip>
<el-table-column label="子件号" prop="subPartCode" align="center"></el-table-column>
<el-table-column label="子件名称" prop="subPartName" align="center"></el-table-column>
<!-- -->
<el-descriptions v-if="dialogData.ppsName == '烧结包装防护'" title="子件" :column="5" border style="margin-top: 24px"></el-descriptions>
<el-table v-if="dialogData.ppsName == '烧结包装防护'" :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="prodTypeName" align="center"></el-table-column>
<el-table-column label="子件类型" prop="subPartTypeName" align="center"></el-table-column>
<el-table-column label="镀种" prop="plateName" 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="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="thickness" align="center"></el-table-column>
<el-table-column label="备注" prop="remark" align="center"></el-table-column>
<el-table-column label="修改人" prop="updateUserRealName" 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>
<template #footer>
@ -404,7 +406,7 @@
<script>
import {dateFormat} from '@/utils/date'
import {createInspection,getInspectionList,getInspectionDetail,fillInspection,getSameLotList,applySameLot,getHardnessList,
refreshHardness,getThicknessList,goQualityRecord,goCertificate,getSubPackageList, getSupplierList} from '@/api/qualityManagement/productionTesting/productionQuality.js'
refreshHardness,getThicknessList,goQualityRecord,goCertificate,getSubPackageList, getSupplierList,getMeasurement} from '@/api/qualityManagement/productionTesting/productionQuality.js'
import sametankView from './components/sametankView.vue';
export default {
components: { sametankView },
@ -437,6 +439,7 @@ export default {
vxeTableData2: [],
remindMsgList:[], //提醒信息列表
thicknessData:[],
measureList:[],
option: {
tip: false,
height: 'auto',
@ -684,7 +687,7 @@ export default {
],
},
{
label: '当前工序',
label: '工序',
prop: 'currentProcessId',
search: true,
type: 'select',
@ -698,7 +701,7 @@ export default {
rules: [
{
required: true,
message: '请输入当前工序',
message: '工序',
trigger: 'blur',
},
],
@ -709,76 +712,76 @@ export default {
res: 'data.records',
},
},
{
label: '下序',
prop: 'nextProcessId',
search: true,
type: 'select',
sortable: true,
filter: true,
// {
// label: '下序',
// prop: 'nextProcessId',
// search: true,
// type: 'select',
// sortable: true,
// filter: true,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
span: 24,
width: 110,
rules: [
{
required: true,
message: '请输入下序',
trigger: 'blur',
},
],
dicUrl:'/api/blade-desk/bsProcessSet/list?curtent=1&size=99999',
props: {
label: 'name',
value: 'id',
res: 'data.records',
},
},
{
label: '状态',
prop: 'status',
search: true,
type: 'select',
sortable: true,
filter: true,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
span: 24,
width: 90,
rules: [
{
required: true,
message: '请输入状态',
trigger: 'blur',
},
],
props:{
label:'dictValue',
value:'dictKey',
},
dicUrl:'/api/blade-system/dict/dictionary?code=InspectionTask-Status', //字典中取值
// dicData: [
// {
// value: 1,
// label: '合格',
// },
// {
// value: 2,
// label: '不合格',
// },
// {
// value: 3,
// label: 'NA(不检验)',
// },
// {
// value: -1,
// label: '未检验',
// },
// ],
},
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// span: 24,
// width: 110,
// rules: [
// {
// required: true,
// message: '请输入下序',
// trigger: 'blur',
// },
// ],
// dicUrl:'/api/blade-desk/bsProcessSet/list?curtent=1&size=99999',
// props: {
// label: 'name',
// value: 'id',
// res: 'data.records',
// },
// },
// {
// label: '状态',
// prop: 'status',
// search: true,
// type: 'select',
// sortable: true,
// filter: true,
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// span: 24,
// width: 90,
// rules: [
// {
// required: true,
// message: '请输入状态',
// trigger: 'blur',
// },
// ],
// props:{
// label:'dictValue',
// value:'dictKey',
// },
// dicUrl:'/api/blade-system/dict/dictionary?code=InspectionTask-Status', //字典中取值
// // dicData: [
// // {
// // value: 1,
// // label: '合格',
// // },
// // {
// // value: 2,
// // label: '不合格',
// // },
// // {
// // value: 3,
// // label: 'NA(不检验)',
// // },
// // {
// // value: -1,
// // label: '未检验',
// // },
// // ],
// },
{
label: '面积(dm²)',
prop: 'area',
@ -881,7 +884,11 @@ export default {
},
};
},
mounted() {},
mounted() {
getMeasurement().then(res =>{
this.measureList = res.data.data
})
},
methods: {
handleCreate(){
createInspection({}).then(res => {
@ -1227,6 +1234,7 @@ export default {
})
},
handleResult(row) {
console.log('row------------------',row)
this.checkedId = row.id
getInspectionDetail({
id: row.id,
@ -1238,7 +1246,6 @@ export default {
this.remindMsgList = res.data.data.remindMsgList;
this.vxeTableData = res.data.data.wpItemList;
this.getSameList(row.id)
console.log('window.YINGDU_Trigger----------------',window.YINGDU_Trigger)
this.vxeTableData.forEach(item =>{
if(item.item.specialType == '2'){
this.ydInterval = setInterval(() =>{
@ -1253,11 +1260,11 @@ export default {
}
})
if(this.dialogData.ppsName == '烧结包装防护'){
if(this.dialogData.ppsName === '烧结包装防护'){
getSubPackageList({
id:row.id
}).then(res =>{
this.vxeTableData1 = [...res.data.data]
yoId:res.data.data.orderInfo.yoId
}).then(res3 =>{
this.vxeTableData1 = res3.data.data
console.log('vxeTableData1------------------',this.vxeTableData1)
})
}

6
src/views/qualityManagement/inspectionArchiving/ERecord/index.vue
Unescape View File

@ -155,7 +155,7 @@ export default {
editBtnText: '修改',
viewBtnText:'详情',
labelWidth: 120,
menuWidth: 230,
menuWidth: 160,
dialogWidth: 1200,
dialogClickModal: false,
searchEnter: true,
@ -184,7 +184,7 @@ export default {
editDisplay: false,
span: 24,
search:true,
width:200,
// width:200,
rules: [
{
required: true,
@ -201,7 +201,7 @@ export default {
hide:true,
span: 24,
search:true,
width:200,
// width:200,
rules: [
{
required: true,

20
src/views/qualityManagement/tankSolutionSystem/inspectionReport.vue
Unescape View File

@ -318,23 +318,23 @@ export default {
},
{
label: '槽号',
prop: 'workTankId',
prop: 'workTankName',
search: false,
type: 'select',
sortable: true,
// type: 'select',
// sortable: true,
filter: true,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
span: 24,
width: 180,
// disbled:true,
// cell: true,
dicUrl:'/api/blade-desk/BA/WorkTank/listForSelect',
props:{
label:'name',
value:'id'
}
// // disbled:true,
// // cell: true,
// dicUrl:'/api/blade-desk/BA/WorkTank/listForSelect',
// props:{
// label:'workTankCode',
// value:'id'
// }
},
{

3
src/views/qualityManagement/tankSolutionSystem/workTankLine.vue
Unescape View File

@ -76,7 +76,7 @@
<div style="width: 33%;margin-bottom: 15px;">作业中心：{{ detailForm.workCenterName }}</div>
<!-- <div style="width: 33%;margin-bottom: 15px;">槽号：{{ detailForm.slotNo }}</div>
<div style="width: 33%;margin-bottom: 15px;">检测成分：{{ detailForm.testName }}</div> -->
<div style="width: 33%;">曲线时间范围：{{ detailForm.lineTime }}</div>
<div style="width: 33%;">曲线时间范围：{{ detailForm.createTimeStart }} ~ {{detailForm.createTimeEnd}}</div>
<div style="width: 33%;">操作人：{{ detailForm.updateUserRealName }}</div>
<div style="width: 33%;">曲线生成时间：{{ detailForm.createTime }}</div>
</div>
@ -381,6 +381,7 @@ export default {
}
]
};
chart.clear();
chart.setOption(option);
})
},

7
src/views/statisticalAnalysis/warehouseAnalysis/inventorySummary.vue
Unescape View File

@ -616,7 +616,12 @@ export default {
this.$message.error('请先选择数据')
return
}
this.showPrint = true
if(this.selectionList.length > 1){
this.$message.error('请选择一条数据')
return
}
window.open(window.WARE_MATERIAL_STOCK_TAG+'?id='+this.selectionList[0].id);
// this.showPrint = true
},
handlePrintCard() {
if (this.selectionList.length == 0) {

Write Preview
Loading…
Cancel
Save