diff --git a/src/views/paintLabManagement/dataBatch.vue b/src/views/paintLabManagement/dataBatch.vue
index adafdb6..9776d41 100644
--- a/src/views/paintLabManagement/dataBatch.vue
+++ b/src/views/paintLabManagement/dataBatch.vue
@@ -11,9 +11,9 @@
-
+
+
+
@@ -68,7 +68,7 @@
-
+
@@ -95,7 +95,17 @@
-
+
+
+ {{ formatSex(row.value07) }}
+
+
+
+
+
+
+
+
@@ -150,9 +160,15 @@
-
-
-
+
+
+ {{ formatName(row.value19) }}
+
+
+
+
+
+
@@ -268,6 +284,17 @@
// 后台数据结构
serverData:[],
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() {
@@ -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(){
this.dialogVisible = false
AddBatchlist({"num":1}).then((res) => {
@@ -320,7 +372,7 @@
let query = { ...this.search, ...this.pagination }
delete query['team']
- delete query['workorderid']
+ //query['workorderid']
delete query['partnumber']
delete query['reportType']
delete query['product_description']
@@ -331,8 +383,8 @@
this.QualityStatisticsTable = res.data.item1
this.pagination.total = res.data.item2
- this.realTotal = this.pagination.total/5
- this.mergeTable(5)
+ this.realTotal = this.pagination.total/6
+ this.mergeTable(6)
this.loading = false
// console.log(res.data)
// console.log(this.pagination.total)
@@ -450,9 +502,10 @@
type: 'warning',
}).then(() => {
const deleteData = {
- workorderid: row.workorderId,
+ idGroup: row.idGroup,
}
- deleteStatisticsTable(deleteData).then((res) => {
+ //console.log(deleteData);
+ DelBatchlist(deleteData).then((res) => {
if (res.code === 200) {
this.$message({
type: 'success',
@@ -481,7 +534,7 @@
//onsole.log(index);
// 计算每组数据的，第一行
- const baseValue = parseInt((index)/5) * 5;
+ const baseValue = parseInt((index)/6) * 6;
const updateData1 = {
id:1,
plIdGroup:"",
@@ -519,8 +572,9 @@
this.serverData.push({ ...updateData1 });
this.serverData.push({ ...updateData1 });
this.serverData.push({ ...updateData1 });
+ this.serverData.push({ ...updateData1 });
//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].plIdGroup = this.QualityStatisticsTable[baseValue+i].idGroup;
this.serverData[i].plDt = this.QualityStatisticsTable[baseValue].dt; // 有合并
diff --git a/src/views/paintLabManagement/dataRawMaterial.vue b/src/views/paintLabManagement/dataRawMaterial.vue
index 7fea6c8..5513c98 100644
--- a/src/views/paintLabManagement/dataRawMaterial.vue
+++ b/src/views/paintLabManagement/dataRawMaterial.vue
@@ -11,12 +11,12 @@
-
-
+
+
+
+
+
+
@@ -75,7 +75,7 @@
-
+
@@ -290,8 +290,8 @@
let query = { ...this.search, ...this.pagination }
delete query['team']
- delete query['workorderid']
- delete query['partnumber']
+ //query['workorderid']
+ //delete query['partnumber']
delete query['reportType']
delete query['product_description']
delete query['total']
diff --git a/src/views/paintLabManagement/dataTest.vue b/src/views/paintLabManagement/dataTest.vue
index 2e42b13..6371264 100644
--- a/src/views/paintLabManagement/dataTest.vue
+++ b/src/views/paintLabManagement/dataTest.vue
@@ -11,9 +11,9 @@
-
+
+
+
@@ -75,7 +75,7 @@
-
+
@@ -102,7 +102,18 @@
-
+
+
+ {{ formatSex(row.value07) }}
+
+
+
+
+
+
+
+
+
@@ -172,6 +183,7 @@
DelTestlist,
UpdateTestlist
} from '@/api/paintLabManagement/dataRawMaterial'
+import { Switch } from 'vxe-table'
export default {
name: 'dataCapture',
@@ -261,6 +273,12 @@
// 后台数据结构
serverData:[],
dialogVisible: false,
+ sexList: [
+ { label: '/', value: '0' },
+ { label: '原漆', value: '1' },
+ { label: '加浆', value: '2' },
+ { label: '库存油漆', value: '3' }
+ ]
}
},
mounted() {
@@ -289,6 +307,20 @@
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(){
this.dialogVisible = false
AddTestlist({"num":1}).then((res) => {
@@ -308,7 +340,7 @@
let query = { ...this.search, ...this.pagination }
delete query['team']
- delete query['workorderid']
+ //query['workorderid']
delete query['partnumber']
delete query['reportType']
delete query['product_description']
@@ -319,8 +351,8 @@
this.QualityStatisticsTable = res.data.item1
this.pagination.total = res.data.item2
- this.realTotal = this.pagination.total/5
- this.mergeTable(5)
+ this.realTotal = this.pagination.total/6
+ this.mergeTable(6)
this.loading = false
// console.log(res.data)
// console.log(this.pagination.total)
@@ -469,7 +501,7 @@
//onsole.log(index);
// 计算每组数据的，第一行
- const baseValue = parseInt((index)/5) * 5;
+ const baseValue = parseInt((index)/6) * 6;
const updateData1 = {
id:1,
plIdGroup:"",
@@ -504,8 +536,9 @@
this.serverData.push({ ...updateData1 });
this.serverData.push({ ...updateData1 });
this.serverData.push({ ...updateData1 });
+ this.serverData.push({ ...updateData1 });
//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].plIdGroup = this.QualityStatisticsTable[baseValue+i].idGroup;
this.serverData[i].plDt = this.QualityStatisticsTable[baseValue].dt; // 有合并