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

src/views/statistics/bxerp/workerTimes.vue

@@ -4,6 +4,7 @@
 			<div class="left-panel"></div>
 			<div class="right-panel">
 				<xtSelect
+				 	v-if="activeName=='shengchan'"
 					:apiObj="apiObj"
 					v-model="query.user_name"
 					:valueField="'name'"
@@ -36,6 +37,10 @@
 			</div>
 		</el-header>
 		<el-main class="nopadding">
+			<el-tabs type="border-card" v-model="activeName" @tab-click="tabsClick" style="height: 100%;" lazy>
+				<el-tab-pane name="shengchan" label="生产统计" style="height: 100%;" key="shengchan">
+					<el-container v-if="activeName=='shengchan'">
+						<el-main>
 							<scTable
 								ref="table"
 								:data="tableData"
@@ -73,6 +78,80 @@
 									</template>
 								</el-table-column>
 							</scTable>
+
+							<el-drawer v-model="visible" :title="userName+'板段列表'" size="50%" direction="rtl" append-to-body destroy-on-close>
+								<el-card shadow="never">
+									<div v-for="(item,index) in detailRow" :key="item" style="height:22px;border-bottom: 1px solid #efefef;">
+										<span style="margin-right:10px;width: 18px;display: inline-block;">{{ index+1 }} </span>
+										{{ item }}
+									</div>
+								</el-card>
+							</el-drawer>
+						</el-main>
+					</el-container>
+				</el-tab-pane>
+				<el-tab-pane name="gongzhuang" label="工装统计" style="height: 100%;" key="gongzhuang">
+					<el-container v-if="activeName=='gongzhuang'">
+						<el-main>
+							<scTable
+								ref="table"
+								:data="tableData"
+								id="exportDiv"
+								row-key="id"
+								hidePagination
+								hideDo
+								stripe
+							>
+								<el-table-column type="index" width="50"  fixed="left"/>
+								<el-table-column label="工装编号" prop="工装编号" :filters="userFilters" :filter-method="filterUser" filter-placement="bottom-end">
+								</el-table-column>
+								<el-table-column label="物料名" prop="物料名" :filters="nameFilters" :filter-method="filterName" filter-placement="bottom-end">
+								</el-table-column>
+								<el-table-column label="总数">
+									<template #default="scope">
+										<span v-if="scope.row.总切片数" @click="handleClick(scope.row)" style="color:#0052d9;">{{ scope.row.总切片数 }}</span>
+										<span v-else @click="handleClick(scope.row)" style="color:#0052d9;">{{ scope.row.总生产数 }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="合格率" prop="合格率">
+									<template #default="scope">
+										<span>{{((scope.row.总切片合格数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+									</template>
+								</el-table-column>
+							</scTable>
+						</el-main>
+					</el-container>
+				</el-tab-pane>
+				<el-tab-pane name="renyuan" label="开台人员统计" style="height: 100%;" key="renyuan">
+					<el-container v-if="activeName=='renyuan'">
+						<el-main>
+							<scTable
+								ref="table"
+								:data="tableData"
+								id="exportDiv"
+								row-key="id"
+								hidePagination
+								hideDo
+								stripe
+							>
+								<el-table-column type="index" width="50"  fixed="left"/>
+								<el-table-column label="开台人" prop="开台人员姓名" :filters="userFilters" :filter-method="filterUser3" filter-placement="bottom-end">
+								</el-table-column>
+								<el-table-column label="物料名" prop="物料名" :filters="nameFilters" :filter-method="filterName" filter-placement="bottom-end">
+								</el-table-column>
+								<el-table-column label="总数" prop="总切片数">
+								</el-table-column>
+								<el-table-column label="合格率" prop="合格率">
+									<template #default="scope">
+										<span v-if="scope.row.总切片数>0">{{((scope.row.总切片合格数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+										<span v-else>0%</span>
+									</template>
+								</el-table-column>
+							</scTable>
+						</el-main>
+					</el-container>
+				</el-tab-pane>
+			</el-tabs>
 		</el-main>
 	</el-container>
 </template>
@@ -93,6 +172,14 @@ export default {
 			lists:[],
 			mgruops:[],
 			tableData:[],
+			userFilters:[],
+			filterUsers:[],
+			nameFilters:[],
+			filterNames:[],
+			visible:false,
+			userName:'',
+			code:'lineDay_p',
+			activeName:'shengchan',
 			apiObj: this.$API.system.user.list,
 		};
 	},
@@ -104,6 +191,12 @@ export default {
 		that.getData();
     },
 	methods: {
+		tabsClick(){
+			let that = this;
+			that.$nextTick(()=>{
+				that.getData();
+			})
+		},
         getData(){
             let that = this;
 			that.lists = [];
@@ -113,10 +206,12 @@ export default {
 			that.coefficient = [];
             let params = {};
             params.query = that.query;
-			that.$API.bi.dataset.exec.req('lineDay_p', params).then((res) => {
+			let code = that.activeName=='shengchan'?'lineDay_p':that.activeName=='gongzhuang'?'product_toolings':'product_kaitairen';
+			that.$API.bi.dataset.exec.req(code, params).then((res) => {
 				let data = res.data2.ds0;
 				let coefficient = [];
 				if(data.length>0){
+					if(that.activeName=='shengchan'){
 						data.forEach(item=>{
 							let obj = item.工序物料生产数?JSON.parse(item.工序物料生产数):{};
 							for(let key in obj){
@@ -155,9 +250,41 @@ export default {
 							item1.time_all = all;
 						})
 					}
+					let userList = [],users = [];
+					let nameList = [],names = [];
+					data.forEach(item=>{
+						if(that.activeName=='gongzhuang'){
+							if(users.indexOf(item.工装编号)>-1){}else{
+								users.push(item.工装编号);
+								userList.push({text:item.工装编号,value:item.工装编号})
+							}
+						}else if(that.activeName=='renyuan'){
+							if(users.indexOf(item.开台人员姓名)>-1){}else{
+								users.push(item.开台人员姓名);
+								userList.push({text:item.开台人员姓名,value:item.开台人员姓名})
+							}
+						}
+						if(names.indexOf(item.物料名)>-1){}else{
+							names.push(item.物料名);
+							nameList.push({text:item.物料名,value:item.物料名})
+						}
+						that.userFilters = userList;
+						that.nameFilters = nameList;
+					})
+				}
 				that.tableData = data;
 			});
         },
+		filterUser(value, row) {
+			return row.工装编号 == value;
+		},
+		filterUser3(value, row) {
+			return row.开台人员姓名 == value;
+		},
+		filterName(value, row) {
+			return row.物料名 == value;
+		},
+		
 		xishuChange(){
 			let that = this;
 			that.tableData.forEach((item1,index1) => {