Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

src/views/statistics/bxerp/cpwgnzcj.vue

@@ -37,164 +37,169 @@
 				<el-table-column type="index" width="50"  fixed="left"/>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_批次号 }}</span>
+						<span>{{ scope.row.data.成品内外初检_批次号 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
 				<el-table-column label="毛坯长点" align="center" class-name="colorheader1">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_毛坯长点?scope.row.data.成品外观内置初检_缺陷项_毛坯长点:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_毛坯长点?scope.row.data.成品内外初检_缺陷项_毛坯长点:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="毛坯点多" align="center" class-name="colorheader2">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_毛坯点多?scope.row.data.成品外观内置初检_缺陷项_毛坯点多:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_毛坯点多?scope.row.data.成品内外初检_缺陷项_毛坯点多:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="白边" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内外初检_缺陷项_白边?scope.row.data.成品内外初检_缺陷项_白边:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="扭后点" align="center" class-name="colorheader3">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_扭后点?scope.row.data.成品外观内置初检_缺陷项_扭后点:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_扭后点?scope.row.data.成品内外初检_缺陷项_扭后点:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="黑网" align="center" class-name="colorheader4">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_黑网?scope.row.data.成品外观内置初检_缺陷项_黑网:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_黑网?scope.row.data.成品内外初检_缺陷项_黑网:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="白网" align="center" class-name="colorheader5">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_白网?scope.row.data.成品外观内置初检_缺陷项_白网:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_白网?scope.row.data.成品内外初检_缺陷项_白网:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="小网" align="center" class-name="colorheader6">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_小网?scope.row.data.成品外观内置初检_缺陷项_小网:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_小网?scope.row.data.成品内外初检_缺陷项_小网:0 }}</span>
 					</template>
 				</el-table-column>	
 				<el-table-column label="花丝" align="center" class-name="colorheader7">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_花丝?scope.row.data.成品外观内置初检_缺陷项_花丝:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_花丝?scope.row.data.成品内外初检_缺陷项_花丝:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="花朵" align="center" class-name="colorheader1">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_花朵?scope.row.data.成品外观内置初检_缺陷项_花朵:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_花朵?scope.row.data.成品内外初检_缺陷项_花朵:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="六角" align="center" class-name="colorheader2">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_六角?scope.row.data.成品外观内置初检_缺陷项_六角:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_六角?scope.row.data.成品内外初检_缺陷项_六角:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="六角白点" align="center" class-name="colorheader3">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_六角白点?scope.row.data.成品外观内置初检_缺陷项_六角白点:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_六角白点?scope.row.data.成品内外初检_缺陷项_六角白点:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="六角黑点" align="center" class-name="colorheader4">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_六角黑点?scope.row.data.成品外观内置初检_缺陷项_六角黑点:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_六角黑点?scope.row.data.成品内外初检_缺陷项_六角黑点:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="复丝结构" align="center" class-name="colorheader5">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_复丝结构?scope.row.data.成品外观内置初检_缺陷项_复丝结构:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_复丝结构?scope.row.data.成品内外初检_缺陷项_复丝结构:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="炫光" align="center" class-name="colorheader6">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_炫光?scope.row.data.成品外观内置初检_缺陷项_炫光:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_炫光?scope.row.data.成品内外初检_缺陷项_炫光:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="包边丝" align="center" class-name="colorheader7">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_包边丝?scope.row.data.成品外观内置初检_缺陷项_包边丝:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_包边丝?scope.row.data.成品内外初检_缺陷项_包边丝:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="畸变" align="center" class-name="colorheader1">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_畸变?scope.row.data.成品外观内置初检_缺陷项_畸变:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_畸变?scope.row.data.成品内外初检_缺陷项_畸变:0 }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="炸废" align="center" class-name="colorheader2">
-					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_炸废?scope.row.data.成品外观内置初检_缺陷项_炸废:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="偏心" align="center" class-name="colorheader3">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_偏心?scope.row.data.成品外观内置初检_缺陷项_偏心:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_偏心?scope.row.data.成品内外初检_缺陷项_偏心:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="划伤" align="center" class-name="colorheader4">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_偏心?scope.row.data.成品外观内置初检_缺陷项_偏心:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_偏心?scope.row.data.成品内外初检_缺陷项_偏心:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="腐蚀" align="center" class-name="colorheader5">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_腐蚀?scope.row.data.成品外观内置初检_缺陷项_腐蚀:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_腐蚀?scope.row.data.成品内外初检_缺陷项_腐蚀:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="崩边" align="center" class-name="colorheader6">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_崩边?scope.row.data.成品外观内置初检_缺陷项_崩边:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_崩边?scope.row.data.成品内外初检_缺陷项_崩边:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="纹路" align="center" class-name="colorheader7">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_纹路?scope.row.data.成品外观内置初检_缺陷项_纹路:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_纹路?scope.row.data.成品内外初检_缺陷项_纹路:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="平台" align="center" class-name="colorheader1">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_平台?scope.row.data.成品外观内置初检_缺陷项_平台:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_平台?scope.row.data.成品内外初检_缺陷项_平台:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="硌/坑" align="center" class-name="colorheader2">
 					<template #default="scope">
-						<span>{{ scope.row.data['成品外观内置初检_缺陷项_硌/坑']?scope.row.data['成品外观内置初检_缺陷项_硌/坑']:0 }}</span>
+						<span>{{ scope.row.data['成品内外初检_缺陷项_硌/坑']?scope.row.data['成品内外初检_缺陷项_硌/坑']:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="麻点" align="center" class-name="colorheader3">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_麻点?scope.row.data.成品外观内置初检_缺陷项_麻点:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_麻点?scope.row.data.成品内外初检_缺陷项_麻点:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="台阶" align="center" class-name="colorheader4">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_台阶?scope.row.data.成品外观内置初检_缺陷项_台阶:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_台阶?scope.row.data.成品内外初检_缺陷项_台阶:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="柱面" align="center" class-name="colorheader5">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_柱面?scope.row.data.成品外观内置初检_缺陷项_柱面:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_柱面?scope.row.data.成品内外初检_缺陷项_柱面:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="污染" align="center" class-name="colorheader6">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_污染?scope.row.data.成品外观内置初检_缺陷项_污染:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_污染?scope.row.data.成品内外初检_缺陷项_污染:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="粗糙度" align="center" class-name="colorheader7">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_粗糙度?scope.row.data.成品外观内置初检_缺陷项_粗糙度:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_粗糙度?scope.row.data.成品内外初检_缺陷项_粗糙度:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="水印" align="center" class-name="colorheader1">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_水印?scope.row.data.成品外观内置初检_缺陷项_水印:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_水印?scope.row.data.成品内外初检_缺陷项_水印:0 }}</span>
 					</template>
 				</el-table-column>	
 				<el-table-column label="角偏" align="center" class-name="colorheader2">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_角偏?scope.row.data.成品外观内置初检_缺陷项_角偏:0 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_角偏?scope.row.data.成品内外初检_缺陷项_角偏:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="炸废" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内外初检_缺陷项_炸废?scope.row.data.成品内外初检_缺陷项_炸废:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="备注" align="center" class-name="colorheader3">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品外观内置初检_缺陷项_备注 }}</span>
+						<span>{{ scope.row.data.成品内外初检_缺陷项_备注 }}</span>
 					</template>
 				</el-table-column>
 			</scTable>

src/views/statistics/bxerp/cpwgnzfj.vue

@@ -0,0 +1,271 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-input v-model="query.batch__contains" 
+					placeholder="批次号" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
+				<el-button
+					@click="handleExport"
+					class="tables"
+					type="primary"
+					>导出</el-button
+				>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable
+				ref="table"
+				:apiObj="apiObj"
+				:params="params"
+				:query="params"
+				id="exportDiv"
+				stripe
+			>
+				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="批次号" fixed="left">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_批次号 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="板号" prop="number" fixed="left">
+				</el-table-column>
+				<el-table-column label="毛坯长点" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_毛坯长点?scope.row.data.成品内质复检_缺陷项_毛坯长点:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="毛坯点多" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_毛坯点多?scope.row.data.成品内质复检_缺陷项_毛坯点多:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="扭后点" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_扭后点?scope.row.data.成品内质复检_缺陷项_扭后点:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="黑网" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_黑网?scope.row.data.成品内质复检_缺陷项_黑网:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="白网" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_白网?scope.row.data.成品内质复检_缺陷项_白网:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="小网废" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_小网废?scope.row.data.成品内质复检_缺陷项_小网废:0 }}</span>
+					</template>
+				</el-table-column>	
+				<el-table-column label="花丝" align="center" class-name="colorheader7">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_花丝?scope.row.data.成品内质复检_缺陷项_花丝:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="花朵重" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_花朵重?scope.row.data.成品内质复检_缺陷项_花朵重:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="六角" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_六角?scope.row.data.成品内质复检_缺陷项_六角:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="六角白点" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_六角白点?scope.row.data.成品内质复检_缺陷项_六角白点:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="六角黑点" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_六角黑点?scope.row.data.成品内质复检_缺陷项_六角黑点:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="白边" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_白边?scope.row.data.成品内质复检_缺陷项_白边:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="复丝结构" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_复丝结构?scope.row.data.成品内质复检_缺陷项_复丝结构:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="炫光" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_炫光?scope.row.data.成品内质复检_缺陷项_炫光:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="包边丝" align="center" class-name="colorheader7">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_包边丝?scope.row.data.成品内质复检_缺陷项_包边丝:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="畸变" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_畸变?scope.row.data.成品内质复检_缺陷项_畸变:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="偏心" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_偏心?scope.row.data.成品内质复检_缺陷项_偏心:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="划伤" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_偏心?scope.row.data.成品内质复检_缺陷项_偏心:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="腐蚀A" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_腐蚀A?scope.row.data.成品内质复检_缺陷项_腐蚀A:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="崩边" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_崩边?scope.row.data.成品内质复检_缺陷项_崩边:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="纹路" align="center" class-name="colorheader7">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_纹路?scope.row.data.成品内质复检_缺陷项_纹路:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="平台" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_平台?scope.row.data.成品内质复检_缺陷项_平台:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="硌/坑" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data['成品内质复检_缺陷项_硌/坑']?scope.row.data['成品内质复检_缺陷项_硌/坑']:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="麻点" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_麻点?scope.row.data.成品内质复检_缺陷项_麻点:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="台阶" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_台阶?scope.row.data.成品内质复检_缺陷项_台阶:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="柱面" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_柱面?scope.row.data.成品内质复检_缺陷项_柱面:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="污染" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_污染?scope.row.data.成品内质复检_缺陷项_污染:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="粗糙度" align="center" class-name="colorheader7">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_粗糙度?scope.row.data.成品内质复检_缺陷项_粗糙度:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="水印" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_水印?scope.row.data.成品内质复检_缺陷项_水印:0 }}</span>
+					</template>
+				</el-table-column>	
+				<el-table-column label="角偏" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_角偏?scope.row.data.成品内质复检_缺陷项_角偏:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="炸废" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_炸废?scope.row.data.成品内质复检_缺陷项_炸废:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷项_备注 }}</span>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+export default {
+	name: "statistics_guan",
+	data() {
+		return {
+			params: {
+				ordering:'data__成品内质复检_批次号',
+				querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内质复检_批次号"}]],
+			},
+			query:{
+				name__contains:'',
+				batch__contains:'',
+				last_time__gte:'',
+				last_time__lte:'',
+			},
+			apiObj: this.$API.wpm.wpr.query,
+			options:[],
+			tableData:[],
+		};
+	},
+	methods: {
+		handleQuery(){
+			let that = this;
+			let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]];
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__成品内外初检_批次号';
+			obj.value = that.query.batch__contains;
+			obj.compare = '';
+
+			obj1.field = 'last_time';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+
+			obj2.field = 'last_time';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+
+			obj3.field = 'data__成品内外初检_物料名';
+			obj3.value = that.query.name__contains;
+			obj3.compare = '';
+
+
+			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
+				querys[0].push(obj);
+			}
+			if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){
+				querys[0].push(obj1);
+			}
+			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+				querys[0].push(obj2);
+			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
+			that.params.querys = querys;
+			this.$refs.table.queryData(that.params);
+		},
+		getCountQt(data,type){
+			let count_qt = 0,count = 0;
+		   
+		}
+	},
+};
+</script>
+
+<style scoped>
+</style>

src/views/statistics/bxerp/gzcpjc.vue

@@ -0,0 +1,161 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<!-- <el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input> -->
+				<el-input v-model="query.batch__contains" 
+					placeholder="批次号" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
+				<el-button
+					@click="handleExport"
+					class="tables"
+					type="primary"
+					>导出</el-button
+				>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable
+				ref="table"
+				:apiObj="apiObj"
+				:params="params"
+				:query="params"
+				id="exportDiv"
+				stripe
+			>
+				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="批次号" fixed="left">
+					<template #default="scope">
+						<span>{{ scope.row.data.光锥成品检测_批次号 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="板号" prop="number" fixed="left">
+				</el-table-column>
+				<el-table-column label="放大率" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span>{{ scope.row.data.光锥成品检测_缺陷项_放大率?scope.row.data.光锥成品检测_缺陷项_放大率:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="方台" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data.光锥成品检测_缺陷项_方台?scope.row.data.光锥成品检测_缺陷项_方台:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="缺角" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.光锥成品检测_缺陷项_缺角?scope.row.data.光锥成品检测_缺陷项_缺角:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="畸变" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span>{{ scope.row.data.光锥成品检测_缺陷项_畸变?scope.row.data.光锥成品检测_缺陷项_畸变:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="高度" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span>{{ scope.row.data.光锥成品检测_缺陷项_高度?scope.row.data.光锥成品检测_缺陷项_高度:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="外径" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span>{{ scope.row.data.光锥成品检测_缺陷项_外径?scope.row.data.光锥成品检测_缺陷项_外径:0 }}</span>
+					</template>
+				</el-table-column>	
+				<el-table-column label="小经" align="center" class-name="colorheader7">
+					<template #default="scope">
+						<span>{{ scope.row.data.光锥成品检测_缺陷项_小经?scope.row.data.光锥成品检测_缺陷项_小经:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="凹面直径" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span>{{ scope.row.data.光锥成品检测_缺陷项_凹面直径?scope.row.data.光锥成品检测_缺陷项_凹面直径:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.光锥成品检测_缺陷项_备注 }}</span>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+export default {
+	name: "statistics_guan",
+	data() {
+		return {
+			params: {
+				ordering:'data__光锥成品检测_批次号',
+				querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"光锥成品检测_批次号"}]],
+			},
+			query:{
+				name__contains:'',
+				batch__contains:'',
+				last_time__gte:'',
+				last_time__lte:'',
+			},
+			apiObj: this.$API.wpm.wpr.query,
+			options:[],
+			tableData:[],
+		};
+	},
+	methods: {
+		handleQuery(){
+			let that = this;
+			let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"光锥成品检测_批次号"}]];
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__光锥成品检测_批次号';
+			obj.value = that.query.batch__contains;
+			obj.compare = '';
+
+			obj1.field = 'last_time';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+
+			obj2.field = 'last_time';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+
+			obj3.field = 'data__光锥成品检测_物料名';
+			obj3.value = that.query.name__contains;
+			obj3.compare = '';
+
+
+			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
+				querys[0].push(obj);
+			}
+			if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){
+				querys[0].push(obj1);
+			}
+			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+				querys[0].push(obj2);
+			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
+			that.params.querys = querys;
+			this.$refs.table.queryData(that.params);
+		},
+		getCountQt(data,type){
+			let count_qt = 0,count = 0;
+		   
+		}
+	},
+};
+</script>
+
+<style scoped>
+</style>

src/views/statistics/bxerp/inmTotal.vue

@@ -8,7 +8,7 @@
 				stripe
 			>
 				<el-table-column type="index" width="50" fixed="left"/>
-				<el-table-column label="产品" prop="物料名" width="120">
+				<el-table-column label="产品" prop="物料名" fixed="left" width="120">
 				</el-table-column>
 				<el-table-column v-for="item in lists" :key="item" :label="item" :prop="item">
 					<template #default="scope">

src/views/statistics/bxerp/workerTimes.vue

@@ -13,11 +13,6 @@
 				>
 					<el-table-column label="姓名" prop="name"></el-table-column>
 				</xtSelect>
-                <!-- <el-input v-model="query.user_name" 
-					placeholder="姓名" 
-					clearable 
-					style="width: 200px;"
-				></el-input> -->
                 <el-date-picker
 					v-model="query.start_date"
 					type="date"
@@ -46,28 +41,24 @@
 				id="exportDiv"
 				stripe
 			>
-				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="日期" prop="日期" width="100" fixed="left">
-				<el-table-column label="日期" prop="日期" width="120">
 				</el-table-column>
-				<el-table-column label="操作人" prop="操作人" width="120">
+				<el-table-column label="操作人" prop="操作人" width="100" fixed="left">
 				</el-table-column>
-				<el-table-column v-for="item in lists" :key="item" :label="item" :prop="item">
+				<el-table-column v-for="item in lists" :key="item" :label="item.text"  align="center">
+					<el-table-column v-for="item1 in item.value" :key="item1" :label="item1">
 						<template #default="scope">
-						{{ scope.row[item] }}
+							<el-input v-if="scope.row.indexs==0&&scope.row" v-model="scope.row[item.text+'_'+item1]"></el-input>
+							<span v-if="scope.row.indexs!==0&&scope.row">{{ scope.row[item.text+'_'+item1] }}</span>
 						</template>
 					</el-table-column>
-				<!-- <el-table-column label="生产数" prop="生产数">
+				</el-table-column>
-					<template #default="scope">
-						<span v-for="item in scope.row.list" :key="item">{{ item.text }}:{{ item.value }}、</span>
-					</template>
-				</el-table-column> -->
 			</scTable>
 		</el-main>
 	</el-container>
 </template>
 
 <script>
-import { genTree } from "@/utils/verificate";
 export default {
 	name: "workerTimes",
 	data() {
@@ -77,46 +68,58 @@ export default {
                 user_name:'',
 				start_date:'',
 			},
-			mgroups: [],
+			lists:[],
+			mgruops:[],
 			tableData:[],
-			groupsProps: {
-				value: "name",
-				multiple: false,
-				emitPath: false,
-				checkStrictly: true,
-				project_code : this.$TOOL.data.get("BASE_INFO").base.base_code
-			},
 			apiObj: this.$API.system.user.list,
 		};
 	},
     mounted() {
         let that = this;
         let date = new Date();
-        that.query.start_date = that.query.end_date = that.$TOOL.dateFormat2(date);
+        that.query.end_date = that.$TOOL.dateFormat2(date);
+		that.query.start_date =  that.query.end_date.split('-')[0] + '-' + that.query.end_date.split('-')[1] + '-01';
 		that.getData();
-		this.getGroup();
     },
 	methods: {
-		getGroup() {
-			let that = this;
-			that.$API.system.dept.list.req({ page: 0, type: 'dept' }).then(res => {
-				that.group = genTree(res);
-			});
-		},
         getData(){
             let that = this;
+			that.mgruops = [];
+			that.tableData = [];
             let params = {};
             params.query = that.query;
 			that.$API.bi.dataset.exec.req('lineDay_p', params).then((res) => {
 				 let data = res.data2.ds0;
 				 that.lists = [];
+				 let coefficient = [];
 				 data.forEach(item=>{
 					let obj = JSON.parse(item.工段物料生产数);
 					for(let key in obj){
+						if(coefficient.indexOf(key)<0){
+							coefficient.push(key);
+						}
+						let mgroup = key.split('_')[0];
+						let pname = key.split('_')[1];
+						if(that.mgruops.indexOf(mgroup)<0){
+							that.mgruops.push(mgroup);
+							that.lists.push({text:mgroup,value:[pname]});
+						}else{
+							var index = that.mgruops.indexOf(mgroup);
+							if(that.lists[index].value.indexOf(pname)<0){
+								that.lists[index].value.push(pname);
+							}
+						}
 						item[key]= obj[key];
-						if(that.lists.indexOf(key)>-1){}else{that.lists.push(key)}
+						item[pname]= obj[key];
 					}
 				 })
+				 let item0 = {日期:'系数',操作人:'',indexs:0};
+				 coefficient.forEach(cof=>{
+					item0[cof]= 1;
+				 })
+				 if(data.length>0){
+					data.unshift(item0);
+				 }
 				 that.tableData = data;
 			});
         },
@@ -125,7 +128,6 @@ export default {
 		},
 		handleQuery(){
 			let that = this;
-			console.log('that.query',that.query)
 			that.getData();
 		},
 	},