白坯报表调整

src/api/kanban/quality.js

@@ -104,3 +104,12 @@ export function getMonthOfYearContrast(data) {
 		data: data
 	});
 }
+
+// 白坯每月不合格数量
+export function getBpMonthNoOk(data) {
+  return request({
+    url: '/quality/qcInterface/getBpMonthNoOk',
+    method: 'get',
+    data: data
+  });
+}

src/views/kanban/quality/kanban1.vue

@@ -211,7 +211,7 @@
           </div>
           <div class="item-table item-table1">
             <div class="titlebox" style="margin-bottom: 14px">
-              <div class="titlename">本年各月产品不合格数量对比</div>
+              <div class="titlename">本年各月白坯不合格数量对比</div>
             </div>
             <div
               id="echart3"
@@ -254,7 +254,7 @@ import {
   getProMonthNoOk,
   getLineDayNoOk,
   getMonthOfYearContrast,
-  getDictData,
+  getDictData, getBpMonthNoOk,
 } from "@/api/kanban/quality";
 import { getDeviceRefreshTime } from "@/api/kanban/equipment";
 import * as echarts from "echarts";
@@ -600,8 +600,8 @@ export default {
       };
       myChart3.setOption(option3);
       // console.log(_this.selectxt)
-      getProMonthNoOk({
+      getBpMonthNoOk({
-        typeCode: "produce",
+        orderType: "produce",
         factoryCode: "ds_" + _this.selectxt,
       }).then((response) => {
         if (response) {

src/views/quality/report/bpDefectItem/index.vue

@@ -34,7 +34,7 @@
 			    <el-form ref="form" :model="form" label-width="80px">
 					<el-row>
 						<el-col :span="24" style="text-align:center">
-							<h2>{{form.column080090}} 年 {{form.column090100}} 月 份 白 坯 不 良 排 列 图</h2>
+							<h2>{{ parseTime(queryParams.yearMonthDate,'{y}-{m}')}}  白 坯 不 良 排 列 图</h2>
 						</el-col>
 					</el-row>
 					<el-descriptions title="" border :column="3" :contentStyle="content_style" :label-style="label_style">
@@ -57,7 +57,6 @@
 						<template v-for="(column, index) in showTitles">
 							<el-table-column align="center" min-width="120" :prop="column.id" :key="column.id" :label="column.titleName"/>
 						</template>
-					</el-table-column>
 				</el-table>
 			</el-tab-pane>
 		</el-tabs>
@@ -68,6 +67,7 @@
 import {getDefectItemTitle,getDefectItemData,getDefectItemLine} from "@/api/quality/qcTable";
 import moment from 'moment';
 import * as echarts from "echarts";
+import {parseTime} from "../../../../utils/ruoyi";
 export default {
 	name: "BpDefectItem",
 	data() {
@@ -142,6 +142,7 @@ export default {
 		this.getList();
 	},
 	methods: {
+    parseTime,
         /**获取默认查询时间段**/
 		getDate() {
 			let start = this.Fungetdate (0);

src/views/quality/report/bpDefectItemPC/index.vue

@@ -34,7 +34,7 @@
 			    <el-form ref="form" :model="form" label-width="80px">
 					<el-row>
 						<el-col :span="24" style="text-align:center">
-							<h2> {{queryParams.yearMonthDate}} 黑蚊香白坯性能不良排列图</h2>
+							<h2> {{ parseTime(queryParams.yearMonthDate,'{y}-{m}')}}  黑蚊香白坯性能不良排列图</h2>
 						</el-col>
 					</el-row>
 					<el-descriptions title="" border :column="3" :contentStyle="content_style" :label-style="label_style">
@@ -53,11 +53,10 @@
 			<el-tab-pane label="报表" name="second">
 				<el-table v-loading="loading" :data="itemProList" border>
 					<el-table-column label="序号" type="index" align="center" :index="indexMethod" fixed/>
-					<el-table-column label="项目" align="center" prop="dataType" min-width="100" fixed>
+					<el-table-column label="项目" align="center" prop="dataType" min-width="100" fixed/>
 						<template v-for="(column, index) in showTitles">
 							<el-table-column align="center" min-width="120" :prop="column.id" :key="column.id" :label="column.titleName"/>
 						</template>
-					</el-table-column>
 				</el-table>
 			</el-tab-pane>
 		</el-tabs>
@@ -182,6 +181,7 @@ export default {
             //获取Table数据
 			getDefectItemDataPC(this.queryParams).then(response => {
 				this.itemProList = response;
+        this.itemProList.push("其他")
 			    this.getTbody();
 				this.loading = false;
 			});