Эх сурвалжийг харах

Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

曹鹤洋 1 жил өмнө
parent
commit
0cbfe5fc64

+ 111 - 89
src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -957,83 +957,83 @@
 
 
 		<div v-if="dateOn" >
-					  <el-tabs v-model="activName" type="card" @tab-click="handleClick">
-					    <el-tab-pane label="当日上报产量"  @click="showTable('工艺资料')"  name="first">
-					      <el-table ref="multipleTable"
-					                :show-overflow-tooltip="true"
-									@selection-change="selectionChange($event)"
-					                :row-style="{ height: '20px' }"
-					                :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-					                :header-cell-style="{ padding: '0px' }" @row-click="getUid"
-					                highlight-current-row="true" @row-dblclick="gytableDatadoubleClick"
-					                style="width: 100%;height: 70vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" >
-					        <el-table-column type="selection" width="55" />
-					        <!-- <el-table-column align="left" label="选择" prop="工单编号"  width="100"/> -->
-					        <el-table-column fixed align="left" label="产品名称" prop="产品名称"  width="200"/>
-					        <el-table-column fixed align="left" label="工序" prop="工序"  width="100"/>
-							<el-table-column fixed align="left" label="产量" prop="产量"  width="70"/>
-					        <el-table-column align="left" label="千件工价" prop="千件工价"  width="85"/>
-					        <el-table-column align="left" label="日定额" prop="日定额"  width="85"/>
-					        <el-table-column align="left" label="补产标准" prop="补产标准"  width="85"/>
-					        <el-table-column align="left" label="难度系数" prop="难度系数"  width="85"/>
-					        <el-table-column align="left" label="印刷方式" prop="印刷方式"  width="85"/>
-							<el-table-column align="left" label="备注" prop="备注"  width="100"/>
-					        <el-table-column align="left" label="组员1" prop="组员1" width="170" />
-					        <el-table-column align="left" label="组员2" prop="组员2" width="170" />
-					        <el-table-column align="left" label="组员3" prop="组员3" width="170" />
-					        <el-table-column align="left" label="组员4" prop="组员4" width="170" />
-					        <el-table-column align="left" label="组员5" prop="组员5" width="70" />
-					        <el-table-column align="left" label="组员6" prop="组员6" width="70" />
-					        <el-table-column align="left" label="组员7" prop="组员7" width="70" />
-					        <el-table-column align="left" label="组员8" prop="组员8" width="70" />
-					        <el-table-column align="left" label="组员9" prop="组员9" width="70" />
-					        <el-table-column align="left" label="组员10" prop="组员10" width="70" />
-                  <el-table-column align="left" label="制程废品" prop="制程废品" width="85" />
-                  <el-table-column align="left" label="制程次品" prop="制程次品" width="85" />
-                  <el-table-column align="left" label="前工序废" prop="前工序废" width="85" />
-                  <el-table-column align="left" label="来料异常" prop="来料异常"  width="85"/>
-                  <el-table-column align="left" label="装版工时" prop="装版工时" width="85" />
-                  <el-table-column align="left" label="保养工时" prop="保养工时" width="85" />
-                  <el-table-column align="left" label="打样工时" prop="打样工时" width="85"/>
-                  <el-table-column align="left" label="异常总工时" prop="异常总工时" width="85"/>
-                  <el-table-column align="left" label="异常补时" prop="异常补时" width="85"/>
-                  <el-table-column align="left" label="异常类型" prop="异常类型"  width="110"/>
-                  <el-table-column align="left" label="通电工时" prop="通电工时" width="85"/>
-                  <el-table-column align="left" label="码开始行" prop="码开始行" width="85" />
-                  <el-table-column align="left" label="码结束行" prop="码结束行" width="85" />
-                  <el-table-column align="left" label="码包" prop="码包" width="70" />
-                  <el-table-column align="left" label="主电表" prop="主电表"  width="70"/>
-                  <el-table-column align="left" label="辅电表" prop="辅电表" width="70" />
-                  <el-table-column align="left" label="色度数" prop="色度数" width="70" />
-                  <el-table-column align="left" label="用户" prop="用户" width="210" />
-                  <el-table-column align="left" label="更新时间" prop="更新时间" width="160" />
-					      </el-table>
-					    </el-tab-pane>
-
-					    <el-tab-pane label="当日制程检验记录"  @click="showTable('印件资料')"  name="second">
-					      <el-table ref="multipleTable"
-					                :row-style="{ height: '20px' }"
-					                :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-					                :header-cell-style="{ padding: '0px' }"
-					                :show-overflow-tooltip="true"
-					                highlight-current-row="true"
-					                style="width: 100%;height: 70vh" border tooltip-effect="dark" :data="drzcDatas" row-key="ID" @selection-change="handleSelectionChange">
-					        <el-table-column type="selection" width="55" />
-					        <el-table-column align="left" label="工单编号" prop="工单编号"  width="85"/>
-					        <el-table-column align="left" label="印件号" prop="印件号" width="70" />
-					        <el-table-column align="left" label="工序名称" prop="工序名称" width="85" />
-					        <el-table-column align="left" label="检验项目" prop="检验项目" width="85"/>
-					  				 <el-table-column
-					  				    v-for="time in columnNames"
-					  				    :key="time"
-					  				    :label="time"
-					  				    :prop="time"
-					  				    align="center"
-					  				    width="80"
-					  				  ></el-table-column>
-					      </el-table>
-					    </el-tab-pane>
-					  </el-tabs>
+		  <el-tabs v-model="activName" type="card" @tab-click="handleClick">
+			<el-tab-pane label="当日上报产量"  @click="showTable('当日上报产量')"  name="first">
+			  <el-table ref="multipleTable"
+						:show-overflow-tooltip="true"
+						@selection-change="selectionChange($event)"
+						:row-style="{ height: '20px' }"
+						:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+						:header-cell-style="{ padding: '0px' }" @row-click="getUid"
+						highlight-current-row="true" @row-dblclick="gytableDatadoubleClick"
+						style="width: 100%;height: 70vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" >
+				<el-table-column type="selection" width="55" />
+				<!-- <el-table-column align="left" label="选择" prop="工单编号"  width="100"/> -->
+				<el-table-column fixed align="left" label="产品名称" prop="产品名称"  width="200"/>
+				<el-table-column fixed align="left" label="工序" prop="工序"  width="100"/>
+				<el-table-column fixed align="left" label="产量" prop="产量"  width="70"/>
+				<el-table-column align="left" label="千件工价" prop="千件工价"  width="85"/>
+				<el-table-column align="left" label="日定额" prop="日定额"  width="85"/>
+				<el-table-column align="left" label="补产标准" prop="补产标准"  width="85"/>
+				<el-table-column align="left" label="难度系数" prop="难度系数"  width="85"/>
+				<el-table-column align="left" label="印刷方式" prop="印刷方式"  width="85"/>
+				<el-table-column align="left" label="备注" prop="备注"  width="100"/>
+				<el-table-column align="left" label="组员1" prop="组员1" width="170" />
+				<el-table-column align="left" label="组员2" prop="组员2" width="170" />
+				<el-table-column align="left" label="组员3" prop="组员3" width="170" />
+				<el-table-column align="left" label="组员4" prop="组员4" width="170" />
+				<el-table-column align="left" label="组员5" prop="组员5" width="70" />
+				<el-table-column align="left" label="组员6" prop="组员6" width="70" />
+				<el-table-column align="left" label="组员7" prop="组员7" width="70" />
+				<el-table-column align="left" label="组员8" prop="组员8" width="70" />
+				<el-table-column align="left" label="组员9" prop="组员9" width="70" />
+				<el-table-column align="left" label="组员10" prop="组员10" width="70" />
+				<el-table-column align="left" label="制程废品" prop="制程废品" width="85" />
+				<el-table-column align="left" label="制程次品" prop="制程次品" width="85" />
+				<el-table-column align="left" label="前工序废" prop="前工序废" width="85" />
+				<el-table-column align="left" label="来料异常" prop="来料异常"  width="85"/>
+				<el-table-column align="left" label="装版工时" prop="装版工时" width="85" />
+				<el-table-column align="left" label="保养工时" prop="保养工时" width="85" />
+				<el-table-column align="left" label="打样工时" prop="打样工时" width="85"/>
+				<el-table-column align="left" label="异常总工时" prop="异常总工时" width="85"/>
+				<el-table-column align="left" label="异常补时" prop="异常补时" width="85"/>
+				<el-table-column align="left" label="异常类型" prop="异常类型"  width="110"/>
+				<el-table-column align="left" label="通电工时" prop="通电工时" width="85"/>
+				<el-table-column align="left" label="码开始行" prop="码开始行" width="85" />
+				<el-table-column align="left" label="码结束行" prop="码结束行" width="85" />
+				<el-table-column align="left" label="码包" prop="码包" width="70" />
+				<el-table-column align="left" label="主电表" prop="主电表"  width="70"/>
+				<el-table-column align="left" label="辅电表" prop="辅电表" width="70" />
+				<el-table-column align="left" label="色度数" prop="色度数" width="70" />
+				<el-table-column align="left" label="用户" prop="用户" width="210" />
+				<el-table-column align="left" label="更新时间" prop="更新时间" width="160" />
+			  </el-table>
+			</el-tab-pane>
+
+			<el-tab-pane label="当日制程检验记录"  @click="showTable('印件资料')"  name="second">
+			  <el-table ref="multipleTable"
+						:row-style="{ height: '20px' }"
+						:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+						:header-cell-style="{ padding: '0px' }"
+						:show-overflow-tooltip="true"
+						highlight-current-row="true"
+						style="width: 100%;height: 70vh" border tooltip-effect="dark" :data="drzcDatas" row-key="ID" @selection-change="handleSelectionChange">
+				<el-table-column type="selection" width="55" />
+				<el-table-column align="left" label="工单编号" prop="工单编号"  width="85"/>
+				<el-table-column align="left" label="印件号" prop="印件号" width="70" />
+				<el-table-column align="left" label="工序名称" prop="工序名称" width="85" />
+				<el-table-column align="left" label="检验项目" prop="检验项目" width="85"/>
+						 <el-table-column
+							v-for="time in columnNames"
+							:key="time"
+							:label="time"
+							:prop="time"
+							align="center"
+							width="80"
+						  ></el-table-column>
+			  </el-table>
+			</el-tab-pane>
+		  </el-tabs>
 		</div>
 		<el-dialog v-model="complaintsShow" style="width: 1000px" lock-scroll :before-close="closecomplaintsShow" title="=客诉记录" destroy-on-close>
 		  <el-table ref="multipleTable"
@@ -5109,24 +5109,46 @@ const FacilityInspect = async () => {
 	  drzcDatas.value=drzcData
 	  console.log(drzcData);
   }
-}
+}
+// 当日上报产量数据
 const FacilitychanLiang = async () => {
-  const response = await facilitychanLiang({machine:JTMC,date:date});
+  const response = await facilitychanLiang({machine:JTMC,date:date});
+  console.log(response.data)
+  
   if(response.code==0){
 		let totalA = response.data['totalA']
 	  	let totalB = response.data['totalB']
-	  	 delete response.data['totalA']
-	  	 delete response.data['totalB']
-	  	
+		let 制程废品A = response.data['制程废品A']
+		let 制程废品B = response.data['制程废品B']
+		let 制程次品A = response.data['制程次品A']
+		let 制程次品B = response.data['制程次品B']
+		let 来料异常A = response.data['来料异常A']
+		let 来料异常B = response.data['来料异常B']
+		let 装版工时A = response.data['装版工时A']
+		let 装版工时B = response.data['装版工时B']
+		
+	  	 delete response.data['制程废品A']
+	  	 delete response.data['制程废品B']
+		 delete response.data['制程次品A']
+		 delete response.data['制程次品B']
+		 delete response.data['来料异常A']
+		 delete response.data['来料异常B']
+		 delete response.data['装版工时A']
+		 delete response.data['装版工时B']
+		 
 	  	gytableData.value=Object.values(response.data)
-	  	
+		
+		console.log(response.data)
+		
+		
+		
 	  	if(totalA){
 	  		let rowA = {
 	  			产品名称: 'A班产量:'+totalA,
 	  			UniqId: "",bzdh: "",cpmc: "",dedh: "",gxh: "",gxmc: "",num: "",sczl_bh98: "",sj1: "",sj2: "",yjno: "",
-	  			主电表: "",产量: "",保养工时: "",制程废品: "",制程次品: "",前工序废: "",千件工价: "",印刷方式: "",备注: "",
-	  			工单编号: "",工序: "",异常总工时: "",异常类型: "",异常补时: "",打样工时: "",日定额: "",更新时间: "",来料异常: "",用户: "",码包: "",
-	  			码开始行: "",码结束行: "",组员1: "",组员2: "",组员3: "",色度数: "",装版工时: "",辅电表: "",通电工时: "",难度系数: "",
+	  			主电表: "",产量: "",保养工时: "",制程废品: 制程废品A,制程次品:制程次品A,前工序废: "",千件工价: "",印刷方式: "",备注: "",
+	  			工单编号: "",工序: "",异常总工时: "",异常类型: "",异常补时: "",打样工时: "",日定额: "",更新时间: "",来料异常: 来料异常A,用户: "",码包: "",
+	  			码开始行: "",码结束行: "",组员1: "",组员2: "",组员3: "",色度数: "",装版工时: 装版工时A,辅电表: "",通电工时: "",难度系数: "",
 	  		}
 	  		gytableData.value.push(rowA)
 	  	}
@@ -5134,9 +5156,9 @@ const FacilitychanLiang = async () => {
 	  		let rowB = {
 	  			产品名称: 'B班产量:'+totalB,
 	  			UniqId: "",bzdh: "",cpmc: "",dedh: "",gxh: "",gxmc: "",num: "",sczl_bh98: "",sj1: "",sj2: "",yjno: "",
-	  			主电表: "",产量: "",保养工时: "",制程废品: "",制程次品: "",前工序废: "",千件工价: "",印刷方式: "",备注: "",
-	  			工单编号: "",工序: "",异常总工时: "",异常类型: "",异常补时: "",打样工时: "",日定额: "",更新时间: "",来料异常: "",用户: "",码包: "",
-	  			码开始行: "",码结束行: "",组员1: "",组员2: "",组员3: "",色度数: "",装版工时: "",辅电表: "",通电工时: "",难度系数: "",
+	  			主电表: "",产量: "",保养工时: "",制程废品: 制程废品B,制程次品: 制程次品B,前工序废: "",千件工价: "",印刷方式: "",备注: "",
+	  			工单编号: "",工序: "",异常总工时: "",异常类型: "",异常补时: "",打样工时: "",日定额: "",更新时间: "",来料异常: 来料异常B,用户: "",码包: "",
+	  			码开始行: "",码结束行: "",组员1: "",组员2: "",组员3: "",色度数: "",装版工时:装版工时B,辅电表: "",通电工时: "",难度系数: "",
 	  		}
 	  		gytableData.value.push(rowB)
 	  	}