Teams/shanghaigangxiangtuzhuangVUE
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2024-06-17

Browse Source
This commit is contained in:
xiaowei.song
2024-06-17 15:53:26 +08:00
parent 070f84777a
commit d9a9b292ac
3 changed files with 122 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/views/paintLabManagement/dataBatch.vue
View File

@@ -11,9 +11,9 @@
<el-date-picker :style="{ width: inputWidth }" v-model="search.endtime" type="datetime" placeholder="选择日期时间" align="right" :picker-options="pickerOptions"> <el-date-picker :style="{ width: inputWidth }" v-model="search.endtime" type="datetime" placeholder="选择日期时间" align="right" :picker-options="pickerOptions">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="工单号"> <el-form-item label="颜色代号">
<el-input v-model.trim="search.workorderid" placeholder="输入工单号" :style="{ width: inputWidth }"></el-input> <el-input v-model.trim="search.workorderid" placeholder="颜色代号" :style="{ width: inputWidth }"></el-input>
</el-form-item> --> </el-form-item>
<!-- <el-form-item label="零件号"> <!-- <el-form-item label="零件号">
<el-input v-model.trim="search.partnumber" placeholder="输入零件号" :style="{ width: inputWidth }"></el-input> <el-input v-model.trim="search.partnumber" placeholder="输入零件号" :style="{ width: inputWidth }"></el-input>
</el-form-item> --> </el-form-item> -->
@@ -68,7 +68,7 @@
<vxe-input v-model="row.code" type="text"></vxe-input> <vxe-input v-model="row.code" type="text"></vxe-input>
</template> </template>
</vxe-column> </vxe-column>
<vxe-column field="value01" title="温度" width="140px" ></vxe-column> <vxe-column field="value01" title="角度" width="140px" ></vxe-column>
<vxe-column field="value02" title="△L" min-width="80px" :edit-render="{autofocus: '.vxe-input--inner'}"> <vxe-column field="value02" title="△L" min-width="80px" :edit-render="{autofocus: '.vxe-input--inner'}">
<template #edit="{ row }"> <template #edit="{ row }">
@@ -95,7 +95,17 @@
<vxe-input v-model="row.value06" type="text"></vxe-input> <vxe-input v-model="row.value06" type="text"></vxe-input>
</template> </template>
</vxe-column> </vxe-column>
<vxe-column field="value07" title="备注" min-width="100px"></vxe-column> <vxe-column field="value07" title="备注" min-width="100px" :edit-render="{}">
<template #default="{ row }">
<span>{{ formatSex(row.value07) }}</span>
</template>
<template #edit="{ row }">
<vxe-select v-model="row.value07" transfer>
<vxe-option v-for="item in sexList" :key="item.value" :value="item.value" :label="item.label"></vxe-option>
</vxe-select>
</template>
</vxe-column>
<vxe-column field="value08" title="调整配方" width="120px" :edit-render="{autofocus: '.vxe-input--inner'}"> <vxe-column field="value08" title="调整配方" width="120px" :edit-render="{autofocus: '.vxe-input--inner'}">
<template #edit="{ row }"> <template #edit="{ row }">
<vxe-input v-model="row.value08" type="text"></vxe-input> <vxe-input v-model="row.value08" type="text"></vxe-input>
@@ -150,9 +160,15 @@
<vxe-input v-model="row.value18" type="text"></vxe-input> <vxe-input v-model="row.value18" type="text"></vxe-input>
</template> </template>
</vxe-column> </vxe-column>
<vxe-column field="value19" title="检验员" min-width="120px" :edit-render="{autofocus: '.vxe-input--inner'}"> <vxe-column field="value19" title="检验员" min-width="120px" :edit-render="{}">
<template #edit="{ row }"> <template #default="{ row }">
<vxe-input v-model="row.value19" type="text"></vxe-input> <span>{{ formatName(row.value19) }}</span>
</template>
<template #edit="{ row }">
<vxe-select v-model="row.value19" transfer>
<vxe-option v-for="item in nameList" :key="item.value" :value="item.value" :label="item.label"></vxe-option>
</vxe-select>
</template> </template>
</vxe-column> </vxe-column>
</vxe-table> </vxe-table>
@@ -268,6 +284,17 @@
// 后台数据结构 // 后台数据结构
serverData:[], serverData:[],
dialogVisible: false, dialogVisible: false,
sexList: [
{ label: '/', value: '0' },
{ label: '原漆', value: '1' },
{ label: '加浆', value: '2' },
{ label: '库存油漆', value: '3' }
],
nameList: [
{ label: '刘会芳', value: '0' },
{ label: '沈桂华', value: '1' },
{ label: '其他', value: '2' }
],
} }
}, },
mounted() { mounted() {
@@ -300,7 +327,32 @@
} }
}, },
formatSex (value) {
switch(value)
{
case '0':return '/';
break;
case '1':return '原漆';
break;
case '2':return '加浆';
break;
case '3':return '库存油漆';
break;
}
return ''
},
formatName (value) {
switch(value)
{
case '0':return '刘会芳';
break;
case '1':return '沈桂华';
break;
case '2':return '其他';
break;
}
return ''
},
addData(){ addData(){
this.dialogVisible = false this.dialogVisible = false
AddBatchlist({"num":1}).then((res) => { AddBatchlist({"num":1}).then((res) => {
@@ -320,7 +372,7 @@
let query = { ...this.search, ...this.pagination } let query = { ...this.search, ...this.pagination }
delete query['team'] delete query['team']
delete query['workorderid'] //query['workorderid']
delete query['partnumber'] delete query['partnumber']
delete query['reportType'] delete query['reportType']
delete query['product_description'] delete query['product_description']
@@ -331,8 +383,8 @@
this.QualityStatisticsTable = res.data.item1 this.QualityStatisticsTable = res.data.item1
this.pagination.total = res.data.item2 this.pagination.total = res.data.item2
this.realTotal = this.pagination.total/5 this.realTotal = this.pagination.total/6
this.mergeTable(5) this.mergeTable(6)
this.loading = false this.loading = false
// console.log(res.data) // console.log(res.data)
// console.log(this.pagination.total) // console.log(this.pagination.total)
@@ -450,9 +502,10 @@
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
const deleteData = { const deleteData = {
workorderid: row.workorderId, idGroup: row.idGroup,
} }
deleteStatisticsTable(deleteData).then((res) => { //console.log(deleteData);
DelBatchlist(deleteData).then((res) => {
if (res.code === 200) { if (res.code === 200) {
this.$message({ this.$message({
type: 'success', type: 'success',
@@ -481,7 +534,7 @@
//onsole.log(index); //onsole.log(index);
// 计算每组数据的，第一行 // 计算每组数据的，第一行
const baseValue = parseInt((index)/5) * 5; const baseValue = parseInt((index)/6) * 6;
const updateData1 = { const updateData1 = {
id:1, id:1,
plIdGroup:"", plIdGroup:"",
@@ -519,8 +572,9 @@
this.serverData.push({ ...updateData1 }); this.serverData.push({ ...updateData1 });
this.serverData.push({ ...updateData1 }); this.serverData.push({ ...updateData1 });
this.serverData.push({ ...updateData1 }); this.serverData.push({ ...updateData1 });
this.serverData.push({ ...updateData1 });
//console.log(this.QualityStatisticsTable[baseValue]) //console.log(this.QualityStatisticsTable[baseValue])
for(var i=0;i<5;i++){ for(var i=0;i<6;i++){
this.serverData[i].id = this.QualityStatisticsTable[baseValue+i].id; this.serverData[i].id = this.QualityStatisticsTable[baseValue+i].id;
this.serverData[i].plIdGroup = this.QualityStatisticsTable[baseValue+i].idGroup; this.serverData[i].plIdGroup = this.QualityStatisticsTable[baseValue+i].idGroup;
this.serverData[i].plDt = this.QualityStatisticsTable[baseValue].dt; // 有合并 this.serverData[i].plDt = this.QualityStatisticsTable[baseValue].dt; // 有合并

18
src/views/paintLabManagement/dataRawMaterial.vue
View File

@@ -11,12 +11,12 @@
<el-date-picker :style="{ width: inputWidth }" v-model="search.endtime" type="datetime" placeholder="选择日期时间" align="right" :picker-options="pickerOptions"> <el-date-picker :style="{ width: inputWidth }" v-model="search.endtime" type="datetime" placeholder="选择日期时间" align="right" :picker-options="pickerOptions">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="工单号"> <el-form-item label="批次号">
<el-input v-model.trim="search.workorderid" placeholder="输入工单号" :style="{ width: inputWidth }"></el-input> <el-input v-model.trim="search.workorderid" placeholder="输入批次号" :style="{ width: inputWidth }"></el-input>
</el-form-item> --> </el-form-item>
<!-- <el-form-item label="零件号"> <el-form-item label="颜色代号">
<el-input v-model.trim="search.partnumber" placeholder="输入零件号" :style="{ width: inputWidth }"></el-input> <el-input v-model.trim="search.partnumber" placeholder="颜色代号" :style="{ width: inputWidth }"></el-input>
</el-form-item> --> </el-form-item>
<!-- <el-form-item label="产品描述"> <!-- <el-form-item label="产品描述">
<el-input v-model.trim="search.product_description" placeholder="输入产品描述" :style="{ width: inputWidth }"></el-input> <el-input v-model.trim="search.product_description" placeholder="输入产品描述" :style="{ width: inputWidth }"></el-input>
</el-form-item> --> </el-form-item> -->
@@ -75,7 +75,7 @@
<vxe-input v-model="row.pci" type="text"></vxe-input> <vxe-input v-model="row.pci" type="text"></vxe-input>
</template> </template>
</vxe-column> </vxe-column>
<vxe-column field="value01" title="温度" width="140px" ></vxe-column> <vxe-column field="value01" title="角度" width="140px" ></vxe-column>
<vxe-column field="value02" title="△L" min-width="80px" :edit-render="{autofocus: '.vxe-input--inner'}"> <vxe-column field="value02" title="△L" min-width="80px" :edit-render="{autofocus: '.vxe-input--inner'}">
<template #edit="{ row }"> <template #edit="{ row }">
@@ -290,8 +290,8 @@
let query = { ...this.search, ...this.pagination } let query = { ...this.search, ...this.pagination }
delete query['team'] delete query['team']
delete query['workorderid'] //query['workorderid']
delete query['partnumber'] //delete query['partnumber']
delete query['reportType'] delete query['reportType']
delete query['product_description'] delete query['product_description']
delete query['total'] delete query['total']

53
src/views/paintLabManagement/dataTest.vue
View File

@@ -11,9 +11,9 @@
<el-date-picker :style="{ width: inputWidth }" v-model="search.endtime" type="datetime" placeholder="选择日期时间" align="right" :picker-options="pickerOptions"> <el-date-picker :style="{ width: inputWidth }" v-model="search.endtime" type="datetime" placeholder="选择日期时间" align="right" :picker-options="pickerOptions">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="工单号"> <el-form-item label="颜色代号">
<el-input v-model.trim="search.workorderid" placeholder="输入工单号" :style="{ width: inputWidth }"></el-input> <el-input v-model.trim="search.workorderid" placeholder="颜色代号" :style="{ width: inputWidth }"></el-input>
</el-form-item> --> </el-form-item>
<!-- <el-form-item label="零件号"> <!-- <el-form-item label="零件号">
<el-input v-model.trim="search.partnumber" placeholder="输入零件号" :style="{ width: inputWidth }"></el-input> <el-input v-model.trim="search.partnumber" placeholder="输入零件号" :style="{ width: inputWidth }"></el-input>
</el-form-item> --> </el-form-item> -->
@@ -75,7 +75,7 @@
<vxe-input v-model="row.code" type="text"></vxe-input> <vxe-input v-model="row.code" type="text"></vxe-input>
</template> </template>
</vxe-column> </vxe-column>
<vxe-column field="value01" title="温度" width="140px" ></vxe-column> <vxe-column field="value01" title="角度" width="140px" ></vxe-column>
<vxe-column field="value02" title="△L" min-width="80px" :edit-render="{autofocus: '.vxe-input--inner'}"> <vxe-column field="value02" title="△L" min-width="80px" :edit-render="{autofocus: '.vxe-input--inner'}">
<template #edit="{ row }"> <template #edit="{ row }">
@@ -102,7 +102,18 @@
<vxe-input v-model="row.value06" type="text"></vxe-input> <vxe-input v-model="row.value06" type="text"></vxe-input>
</template> </template>
</vxe-column> </vxe-column>
<vxe-column field="value07" title="备注" min-width="100px"></vxe-column> <vxe-column field="value07" title="备注1" min-width="100px" :edit-render="{}">
<template #default="{ row }">
<span>{{ formatSex(row.value07) }}</span>
</template>
<template #edit="{ row }">
<vxe-select v-model="row.value07" transfer>
<vxe-option v-for="item in sexList" :key="item.value" :value="item.value" :label="item.label"></vxe-option>
</vxe-select>
</template>
</vxe-column>
<vxe-column field="value08" title="调整配方" width="120px" :edit-render="{autofocus: '.vxe-input--inner'}"> <vxe-column field="value08" title="调整配方" width="120px" :edit-render="{autofocus: '.vxe-input--inner'}">
<template #edit="{ row }"> <template #edit="{ row }">
<vxe-input v-model="row.value08" type="text"></vxe-input> <vxe-input v-model="row.value08" type="text"></vxe-input>
@@ -172,6 +183,7 @@
DelTestlist, DelTestlist,
UpdateTestlist UpdateTestlist
} from '@/api/paintLabManagement/dataRawMaterial' } from '@/api/paintLabManagement/dataRawMaterial'
import { Switch } from 'vxe-table'
export default { export default {
name: 'dataCapture', name: 'dataCapture',
@@ -261,6 +273,12 @@
// 后台数据结构 // 后台数据结构
serverData:[], serverData:[],
dialogVisible: false, dialogVisible: false,
sexList: [
{ label: '/', value: '0' },
{ label: '原漆', value: '1' },
{ label: '加浆', value: '2' },
{ label: '库存油漆', value: '3' }
]
} }
}, },
mounted() { mounted() {
@@ -289,6 +307,20 @@
this.mergeCells.push({ row: i, col: 17, rowspan: num, colspan: 0 }); this.mergeCells.push({ row: i, col: 17, rowspan: num, colspan: 0 });
} }
}, },
formatSex (value) {
switch(value)
{
case '0':return '/';
break;
case '1':return '原漆';
break;
case '2':return '加浆';
break;
case '3':return '库存油漆';
break;
}
return ''
},
addData(){ addData(){
this.dialogVisible = false this.dialogVisible = false
AddTestlist({"num":1}).then((res) => { AddTestlist({"num":1}).then((res) => {
@@ -308,7 +340,7 @@
let query = { ...this.search, ...this.pagination } let query = { ...this.search, ...this.pagination }
delete query['team'] delete query['team']
delete query['workorderid'] //query['workorderid']
delete query['partnumber'] delete query['partnumber']
delete query['reportType'] delete query['reportType']
delete query['product_description'] delete query['product_description']
@@ -319,8 +351,8 @@
this.QualityStatisticsTable = res.data.item1 this.QualityStatisticsTable = res.data.item1
this.pagination.total = res.data.item2 this.pagination.total = res.data.item2
this.realTotal = this.pagination.total/5 this.realTotal = this.pagination.total/6
this.mergeTable(5) this.mergeTable(6)
this.loading = false this.loading = false
// console.log(res.data) // console.log(res.data)
// console.log(this.pagination.total) // console.log(this.pagination.total)
@@ -469,7 +501,7 @@
//onsole.log(index); //onsole.log(index);
// 计算每组数据的，第一行 // 计算每组数据的，第一行
const baseValue = parseInt((index)/5) * 5; const baseValue = parseInt((index)/6) * 6;
const updateData1 = { const updateData1 = {
id:1, id:1,
plIdGroup:"", plIdGroup:"",
@@ -504,8 +536,9 @@
this.serverData.push({ ...updateData1 }); this.serverData.push({ ...updateData1 });
this.serverData.push({ ...updateData1 }); this.serverData.push({ ...updateData1 });
this.serverData.push({ ...updateData1 }); this.serverData.push({ ...updateData1 });
this.serverData.push({ ...updateData1 });
//console.log(this.QualityStatisticsTable[baseValue]) //console.log(this.QualityStatisticsTable[baseValue])
for(var i=0;i<5;i++){ for(var i=0;i<6;i++){
this.serverData[i].id = this.QualityStatisticsTable[baseValue+i].id; this.serverData[i].id = this.QualityStatisticsTable[baseValue+i].id;
this.serverData[i].plIdGroup = this.QualityStatisticsTable[baseValue+i].idGroup; this.serverData[i].plIdGroup = this.QualityStatisticsTable[baseValue+i].idGroup;
this.serverData[i].plDt = this.QualityStatisticsTable[baseValue].dt; // 有合并 this.serverData[i].plDt = this.QualityStatisticsTable[baseValue].dt; // 有合并