src/views/report/Product/monthly.vue

@@ -7,47 +7,24 @@
 -->
 <template>
   <div class="weekly">
-		<el-form
+    <el-form :inline="true" :model="listQuery" class="blueTip">
-			:inline="true"
+      <el-form-item label="月" prop="reportTime">
-			:model="listQuery"
+        <el-date-picker v-model="listQuery.time" value-format="yyyy-MM-dd HH:mm:ss" type="month" size="small" placeholder="选择月">
-			class="blueTip">
+        </el-date-picker>
-			<el-form-item
-				label="月"
-				prop="reportTime">
-				<el-date-picker
-					v-model="listQuery.time"
-					value-format="yyyy-MM-dd HH:mm:ss"
-					type="month"
-					size="small"
-					placeholder="选择月"></el-date-picker>
       </el-form-item>
-			<el-button
+      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" size="small" @click="getList">
-				v-if="this.$auth.hasPermi('base:report-auto-production:query')"
-				type="primary"
-				size="small"
-				@click="getList">
         查询
       </el-button>
-			<el-button
+      <el-button v-if="this.$auth.hasPermiAnd(['base:report-auto-original-glass:export', 'base:report-auto-production:export'])" type="primary" size="small" plain
-				v-if="
+        @click="handleExport">导出</el-button>
-					this.$auth.hasPermiAnd([
-						'base:report-auto-original-glass:export',
-						'base:report-auto-production:export',
-					])
-				"
-				type="primary"
-				size="small"
-				plain
-				@click="handleExport">
-				导出
-			</el-button>
     </el-form>
     <base-table
 			:table-props="tableProps"
 			:table-data="tableData"
-			:span-method="objectSpanMethod1"
+      :span-method="mergeColumnHandler"
 			@emitFun="handleEmitFun"
-			:max-height="tableH" />
+			:max-height="tableH"
+		/>
     <!-- <monthWeek v-if="glassWeekShow" ref="monthWeek" :product="false" :params="listQuery" />
     <proMonth v-if="proWeekShow" ref="proMonth" :product="false" :params="listQuery" /> -->
   </div>
@@ -57,9 +34,9 @@
 // import monthWeek from '../glass/month.vue'
 // import proMonth from '../productionMonthReport/index.vue'
 import { productionMonthY } from '@/api/report/glass';
-import { parseTime } from '../../core/mixins/code-filter';
+import { parseTime } from '../../core/mixins/code-filter'
-import FileSaver from 'file-saver';
+import FileSaver from 'file-saver'
-import * as XLSX from 'xlsx/xlsx.mjs';
+import * as XLSX from 'xlsx/xlsx.mjs'
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
@@ -69,7 +46,7 @@ export default {
     return {
       heightNum: 240,
       listQuery: {
-				time: parseTime(new Date()),
+				time: parseTime(new Date())
       },
       // startTimeStamp: '',
       // endTimeStamp: '',
@@ -80,16 +57,15 @@ export default {
 			tableProps: [
         {
           prop: 'lineName',
-					label: '',
+          label: ''
         },
         {
           prop: 'paramsName',
-					label: '',
+          label: ''
-				},
+        }
       ],
-			resData: [],
+      resData: []
-			span1: [], //表格1的合并规则
+    }
-		};
   },
   created() {
     // this.getCurrentMonthFirst()
@@ -97,111 +73,93 @@ export default {
     // this.proWeekShow = true
   },
   mounted() {
-		this.getList();
+    this.getList()
   },
   methods: {
+    /** 合并table列的规则 */
+		mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
+			// if (columnIndex == 0 || columnIndex == 1) {
+			// 	if (this.spanInfo[rowIndex]) {
+			// 		return [
+			// 			this.spanInfo[rowIndex], // row span
+			// 			1, // col span
+			// 		];
+			// 	} else {
+			// 		return [0, 0];
+			// 	}
+			// }
+		},
     async getList() {
-			this.tableData = [];
+      this.tableData = []
       this.tableProps = [
         {
           prop: 'lineName',
-					label: '',
+          label: ''
-					fixed: true,
         },
         {
           prop: 'paramsName',
-					label: '',
+          label: ''
-					fixed: true,
+        }
-				},
+      ]
-			];
+      await productionMonthY(this.listQuery).then(res => {
-			await productionMonthY(this.listQuery).then((res) => {
+        this.resData = res.data
-				this.resData = res.data;
         // 设置表头
-				Object.keys(this.resData).forEach((item) => {
+        Object.keys(this.resData).forEach(item => {
           this.tableProps.push({
             prop: item,
             label: item,
-						'show-overflow-tooltip': true,
+            'show-overflow-tooltip': true
-					});
+          })
-				});
+        })
-				this.buildTableData(this.resData);
+        this.buildTableData()
-			});
+      })
     },
     // 设置表格数据
-		buildTableData(data) {
+    buildTableData() {
-			let keys = Object.keys(data);
+      const temp = Object.values(this.resData)
-			let tempData = [];
+      console.log('temp', temp)
-			let subKeys = Object.keys(data[keys[0]]);
+      const dataArray = []
-			let sub2Keys = Object.keys(data[keys[0]][subKeys[0]]);
+      // Object.entries(this.resData).forEach(en => {
-			for (let i = 0; i < keys.length; i++) {
+      //   console.log('你好', en)
-				if (i === 0) {
+        // const date = en[0]
-					for (let j = 0; j < subKeys.length; j++) {
+        // let valueArray = []
-						for (let k = 0; k < sub2Keys.length; k++) {
+        // Object.entries(en[1]).forEach((values, sequence) => {
-							let obj = {};
+        //   let yValue = {}
-							obj.lineName = subKeys[j];
+        //   yValue['line'] = values[0]
-							obj.paramsName = sub2Keys[k];
+        //   Object.entries(values[1]).forEach((lastV, index) => {
-							obj[keys[0]] = data[keys[0]][subKeys[j]][sub2Keys[k]];
+        //     console.log(lastV)
-							tempData.push(obj);
+        //     const tempValue = {}
-						}
+        //     if (values[0] === yValue['line']) {
-					}
+        //       tempValue[values[0]] = lastV[1]
-				} else {
+        //     }
-					for (let j = 0; j < subKeys.length; j++) {
+        //     valueArray.push(tempValue)
-						for (let k = 0; k < sub2Keys.length; k++) {
+        //   })
-							for (let v = 0; v < tempData.length; v++) {
+        //   yValue[date+'-'+sequence] = valueArray
-								if (
+        //   dataArray.push(yValue)
-									tempData[v].lineName === subKeys[j] &&
+        // })
-									tempData[v].paramsName === sub2Keys[k]
+      // })
-								) {
+      // for (let key in temp) {
-									tempData[v][keys[i]] = data[keys[i]][subKeys[j]][sub2Keys[k]];
+      //   console.log('你好', temp[key])
-								}
+      // }
-							}
+      // 产线
-						}
+      Object.keys(temp[0]).forEach(item => {
-					}
+        // 规格循环
-				}
+        Object.keys(Object.values(temp[0])[0]).forEach(it => {
-			}
+          const row = {
-			this.tableData = tempData;
+            lineName: item,
-			this.getSpanArr(this.tableData);
+            paramsName: it
-		},
-		// 获取合并行
-		getSpanArr(data) {
-			this.span1 = [];
-			for (var i = 0; i < data.length; i++) {
-				if (i === 0) {
-					this.span1.push(1);
-					this.index = 0;
-				} else {
-					if (data[i].lineName === data[i - 1].lineName) {
-						this.span1[this.index] += 1;
-						this.span1.push(0);
-					} else {
-						this.span1.push(1);
-						this.index = i;
-					}
-				}
-			}
-		},
-		objectSpanMethod1({ rowIndex, columnIndex }) {
-			if (columnIndex === 0) {
-				const _row = this.span1[rowIndex];
-				return {
-					rowspan: _row,
-					colspan: 1,
-				};
           }
+          this.tableData.push(row)
+        })
+      })
     },
     handleExport() {
-			const xlsxParam = { raw: true };
+      const xlsxParam = { raw: true }
-			let workbook = XLSX.utils.book_new();
+      let workbook = XLSX.utils.book_new()
-			var ws = XLSX.utils.table_to_sheet(
+      var ws = XLSX.utils.table_to_sheet( document.querySelector('#exportTable'), xlsxParam)
-				document.querySelector('#exportTable'),
+      XLSX.utils.book_append_sheet(workbook, ws, '许昌安彩月原片生产汇总')
-				xlsxParam
+      var prows = XLSX.utils.table_to_sheet( document.querySelector('#exportproductionTable'), xlsxParam)
-			);
+      XLSX.utils.book_append_sheet(workbook, prows, '许昌安彩月成品生产汇总')
-			XLSX.utils.book_append_sheet(workbook, ws, '许昌安彩月原片生产汇总');
-			var prows = XLSX.utils.table_to_sheet(
-				document.querySelector('#exportproductionTable'),
-				xlsxParam
-			);
-			XLSX.utils.book_append_sheet(workbook, prows, '许昌安彩月成品生产汇总');
       let fileName = '生产数据汇总表-月报.xlsx';
       var wbout = XLSX.write(workbook, {
         bookType: 'xlsx',
@@ -221,23 +179,23 @@ export default {
     },
     handleEmitFun(payload) {
 			console.log('payload', payload);
-		},
+		}
-	},
+  }
-};
+}
 </script>
 
 <style scoped>
 .weekly {
   padding: 16px;
 }
-.blueTip::before {
+.blueTip::before{
   display: inline-block;
   content: '';
   width: 4px;
   height: 18px;
-	background: #0b58ff;
+  background: #0B58FF;
   border-radius: 1px;
-	margin-right: 8px;
+  margin-right: 8PX;
   margin-top: 8px;
   margin-left: 16px;
 }