diff --git a/src/views/statistics/ppass_num_gx.vue b/src/views/statistics/ppass_num_gx.vue
index a3d210dc..01a0c5c7 100644
--- a/src/views/statistics/ppass_num_gx.vue
+++ b/src/views/statistics/ppass_num_gx.vue
@@ -54,8 +54,6 @@
:data="tableData"
:height="tableHeight"
id="exportDiv"
- :summary-method="getSummaries"
- show-summary
>
diff --git a/src/views/statistics/process_statistics_gx.vue b/src/views/statistics/process_statistics_gx.vue
index 38f5b5ab..5fc9e0b0 100644
--- a/src/views/statistics/process_statistics_gx.vue
+++ b/src/views/statistics/process_statistics_gx.vue
@@ -52,11 +52,6 @@
{{ scope.row.data.扫边A_缺陷_划伤 }}
-
-
- {{ scope.row.data.扫边A_缺陷_其他 }}
-
-
@@ -79,58 +74,53 @@
{{ scope.row.data.扫边A_缺陷_调机破损 }}
-
-
- {{ scope.row.data.扫边A_缺陷_其他 }}
-
-
- {{ scope.row.data.扫边A_缺陷_大崩 }}
+ {{ scope.row.data.扫边A_缺陷_崩边 }}
-
- {{ scope.row.data['扫边A_缺陷_小崩边(B)'] }}
-
-
-
- {{ getCountQt(scope.row.data) }}
-
+
+ {{ scope.row.data.扫边A_缺陷_小崩边 }}
+
+
+ {{ getCountQt(scope.row.data,'扫边A') }}
+
+
- {{ scope.row.data.扫边B_缺陷_裂纹 }}
+ {{ scope.row.data.扫边B_加工前_缺陷_裂纹 }}
- {{ scope.row.data.扫边B_缺陷_断裂 }}
+ {{ scope.row.data.扫边B_加工前_缺陷_断裂 }}
- {{ scope.row.data.扫边B_缺陷_划伤 }}
+ {{ scope.row.data.扫边B_加工前_缺陷_划伤 }}
-
+
- {{ scope.row.data['扫边B_缺陷_抛光未磨透(线痕)'] }}
+ {{ scope.row.data.扫边B_加工前_缺陷_线痕 }}
- {{ scope.row.data.扫边B_缺陷_麻点 }}
+ {{ scope.row.data.扫边B_加工前_缺陷_麻点 }}
-
- {{ scope.row.data.扫边B_缺陷_其他 }}
-
-
+
+ {{ getCountQt(scope.row.data,'扫边B前') }}
+
+
@@ -143,11 +133,6 @@
{{ scope.row.data.扫边B_缺陷_材料不良 }}
-
-
- {{ scope.row.data.扫边B_缺陷_其他 }}
-
-
@@ -167,7 +152,7 @@
- {{ scope.row.data.扫边B_缺陷_抛光未磨透 }}
+ {{ scope.row.data.扫边B_缺陷_线痕 }}
@@ -180,41 +165,36 @@
{{ scope.row.data.扫边B_缺陷_断裂 }}
-
-
- {{ scope.row.data.扫边B_缺陷_其他 }}
-
-
- {{ scope.row.data.扫边B_缺陷_大崩 }}
+ {{ scope.row.data.扫边B_缺陷_崩边 }}
-
- {{ scope.row.data['扫边B_缺陷_小崩边(B)'] }}
-
-
-
- {{ getCountQt(scope.row.data) }}
-
+
+ {{ scope.row.data.扫边B_缺陷_小崩边 }}
+
+
+ {{ getCountQt(scope.row.data,'扫边B') }}
+
+
- {{ scope.row.data.精雕_缺陷_大崩 }}
+ {{ scope.row.data.精雕_加工前_缺陷_崩边 }}
-
- {{ scope.row.data['精雕_缺陷_小崩边(B)'] }}
+
+ {{ scope.row.data.精雕_加工前_缺陷_小崩边}}
- {{ getCountQt(scope.row.data,'精雕') }}
+ {{ getCountQt(scope.row.data,'精雕前') }}
-
+
+
+
+ {{ getCountQt(scope.row.data,'精雕') }}
+
- {{ scope.row.data.倒角_缺陷_大崩 }}
+ {{ scope.row.data.倒角_加工前_缺陷_崩边 }}
- {{ scope.row.data['倒角_缺陷_小崩边(B)'] }}
+ {{ scope.row.data.倒角_加工前_缺陷_崩边 }}
- {{ getCountQt(scope.row.data,'倒角') }}
+ {{ getCountQt(scope.row.data,'倒角前') }}
-
+
+
- {{ scope.row.data.倒角_缺陷_大崩 }}
+ {{ scope.row.data.倒角_缺陷_崩边 }}
- {{ scope.row.data['倒角_缺陷_小崩边(B)'] }}
+ {{ scope.row.data.倒角_缺陷_小崩边 }}
-
+
+
{{ getCountQt(scope.row.data,'倒角') }}
-
-
+
+
+
+ {{ scope.row.data.减薄A_缺陷_崩边 }}
+
+
+ {{ scope.row.data.减薄A_缺陷_小崩边 }}
-
-
- {{ scope.row.data.减薄A_缺陷_大崩 }}
-
-
- {{ scope.row.data['减薄A_缺陷_小崩边(B)'] }}
-
-
-
- {{ getCountQt(scope.row.data,'减薄A') }}
-
-
+
+
+ {{ getCountQt(scope.row.data,'减薄A') }}
+
-
+
+
- {{ scope.row.data.减薄B_缺陷_大崩 }}
+ {{ scope.row.data.减薄B_缺陷_崩边 }}
- {{ scope.row.data['减薄B_缺陷_小崩边(B)'] }}
-
-
-
- {{ getCountQt(scope.row.data,'减薄B') }}
-
+ {{ scope.row.data.减薄B_缺陷_小崩边 }}
+
+
+ {{ getCountQt(scope.row.data,'减薄B') }}
+
+
- {{ scope.row.data.磨抛_缺陷_大崩 }}
+ {{ scope.row.data.磨抛_缺陷_崩边 }}
-
- {{ scope.row.data['磨抛_缺陷_小崩边(B)'] }}
+
+ {{ scope.row.data.磨抛_缺陷_小崩边 }}
- {{ getCountQt(scope.row.data,'磨抛') }}
+ {{ getCountQt(scope.row.data,'磨抛前') }}
-
+
+
+
+ {{ getCountQt(scope.row.data,'磨抛') }}
+
- {{ scope.row.data.一次超洗_缺陷_大崩 }}
+ {{ scope.row.data.一次超洗_加工前_缺陷_崩边 }}
-
- {{ scope.row.data['一次超洗_缺陷_小崩边(B)'] }}
+
+ {{ scope.row.data.一次超洗_加工前_缺陷_小崩边 }}
+
+
+
+ {{ getCountQt(scope.row.data,'一次超洗前') }}
+
-
+
- {{ scope.row.data.二次超洗_缺陷_大崩 }}
+ {{ scope.row.data.二次超洗_加工前_缺陷_崩边 }}
-
- {{ scope.row.data['二次超洗_缺陷_小崩边(B)'] }}
+
+ {{ scope.row.data.二次超洗_加工前_缺陷_小崩边 }}
+
+
+
+ {{ getCountQt(scope.row.data,'二次超洗前') }}
+
-
+
@@ -635,8 +586,292 @@ export default {
getCountQt(data,type){
let count_qt = 0,count = 0;
if(type=='扫边A'){
- if(data){
- count_qt = data.棒料成型_count_notok - count;
+ if(data.扫边A_count_notok){
+ if (data.扫边A_缺陷_气泡 !== undefined) {
+ count += data.扫边A_缺陷_气泡 ;
+ }
+ if (data.扫边A_缺陷_线痕 !== undefined) {
+ count += data.扫边A_缺陷_线痕 ;
+ }
+ if (data.扫边A_缺陷_断裂 !== undefined) {
+ count += data.扫边A_缺陷_断裂 ;
+ }
+ if (data.扫边A_缺陷_划伤 !== undefined) {
+ count += data.扫边A_缺陷_划伤 ;
+ }
+ if (data.扫边A_缺陷_人为磕碰 !== undefined) {
+ count += data.扫边A_缺陷_人为磕碰 ;
+ }
+ if (data.扫边A_缺陷_设备故障 !== undefined) {
+ count += data.扫边A_缺陷_设备故障 ;
+ }
+ if (data.扫边A_缺陷_断点 !== undefined) {
+ count += data.扫边A_缺陷_断点 ;
+ }
+ if (data.扫边A_缺陷_调机破损 !== undefined) {
+ count += data.扫边A_缺陷_调机破损 ;
+ }
+ if (data.扫边A_缺陷_崩边 !== undefined) {
+ count += data.扫边A_缺陷_崩边 ;
+ }
+ if (data.扫边A_缺陷_小崩边 !== undefined) {
+ count += data.扫边A_缺陷_小崩边 ;
+ }
+ count_qt = data.扫边A_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='扫边B前'){
+ if(data.扫边B_count_pn_jgqbl){
+ if (data.扫边B_加工前_缺陷_裂纹 !== undefined) {
+ count += data.扫边B_加工前_缺陷_裂纹 ;
+ }
+ if (data.扫边B_加工前_缺陷_断裂 !== undefined) {
+ count += data.扫边B_加工前_缺陷_断裂 ;
+ }
+ if (data.扫边B_加工前_缺陷_划伤 !== undefined) {
+ count += data.扫边B_加工前_缺陷_划伤 ;
+ }
+ if (data.扫边B_加工前_缺陷_线痕 !== undefined) {
+ count += data.扫边B_加工前_缺陷_线痕 ;
+ }
+ if (data.扫边B_加工前_缺陷_麻点 !== undefined) {
+ count += data.扫边B_加工前_缺陷_麻点 ;
+ }
+ count_qt = data.扫边B_count_pn_jgqbl - count;
+ return count_qt;
+ }
+ }else if(type=='扫边B'){
+ if(data.扫边B_count_notok){
+ if (data.扫边B_缺陷_黑圈不良 !== undefined) {
+ count += data.扫边B_缺陷_黑圈不良 ;
+ }
+ if (data.扫边B_缺陷_材料不良 !== undefined) {
+ count += data.扫边B_缺陷_材料不良 ;
+ }
+ if (data.扫边B_缺陷_人为磕碰 !== undefined) {
+ count += data.扫边B_缺陷_人为磕碰 ;
+ }
+ if (data.扫边B_缺陷_设备故障 !== undefined) {
+ count += data.扫边B_缺陷_设备故障 ;
+ }
+ if (data.扫边B_缺陷_脏污 !== undefined) {
+ count += data.扫边B_缺陷_脏污 ;
+ }
+ if (data.扫边B_缺陷_线痕 !== undefined) {
+ count += data.扫边B_缺陷_线痕 ;
+ }
+ if (data.扫边B_缺陷_调机破损 !== undefined) {
+ count += data.扫边B_缺陷_调机破损 ;
+ }
+ if (data.扫边B_缺陷_断裂 !== undefined) {
+ count += data.扫边B_缺陷_断裂 ;
+ }
+ if (data.扫边B_缺陷_崩边 !== undefined) {
+ count += data.扫边B_缺陷_崩边 ;
+ }
+ if (data.扫边B_缺陷_小崩边 !== undefined) {
+ count += data.扫边B_缺陷_小崩边 ;
+ }
+ count_qt = data.扫边B_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='精雕前'){
+ if(data.精雕_count_pn_jgqbl){
+ if (data.精雕_加工前_缺陷_崩边 !== undefined) {
+ count += data.精雕_加工前_缺陷_崩边 ;
+ }
+ if (data.精雕_加工前_缺陷_小崩边 !== undefined) {
+ count += data.精雕_加工前_缺陷_小崩边 ;
+ }
+ count_qt = data.扫边B_count_pn_jgqbl - count;
+ return count_qt;
+ }
+ }else if(type=='精雕'){
+ if(data.精雕_count_notok){
+ if (data.精雕_缺陷_黑圈不良 !== undefined) {
+ count += data.精雕_缺陷_黑圈不良 ;
+ }
+ if (data.精雕_缺陷_材料不良 !== undefined) {
+ count += data.精雕_缺陷_材料不良 ;
+ }
+ if (data.精雕_缺陷_调机破损 !== undefined) {
+ count += data.精雕_缺陷_调机破损 ;
+ }
+ if (data.精雕_缺陷_人为磕碰 !== undefined) {
+ count += data.精雕_缺陷_人为磕碰 ;
+ }
+ count_qt = data.精雕_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='倒角前'){
+ if(data.倒角_count_pn_jgqbl){
+ if (data.倒角_加工前_缺陷_崩边 !== undefined) {
+ count += data.倒角_加工前_缺陷_崩边 ;
+ }
+ if (data.倒角_加工前_缺陷_小崩边 !== undefined) {
+ count += data.倒角_加工前_缺陷_小崩边 ;
+ }
+ count_qt = data.扫边B_count_pn_jgqbl - count;
+ return count_qt;
+ }
+ }else if(type=='倒角'){
+ if(data.倒角_count_notok){
+ if (data.倒角_缺陷_黑圈不良 !== undefined) {
+ count += data.倒角_缺陷_黑圈不良 ;
+ }
+ if (data.倒角_缺陷_材料不良 !== undefined) {
+ count += data.倒角_缺陷_材料不良 ;
+ }
+ if (data.倒角_缺陷_调机破损 !== undefined) {
+ count += data.倒角_缺陷_调机破损 ;
+ }
+ if (data.倒角_缺陷_人为磕碰 !== undefined) {
+ count += data.倒角_缺陷_人为磕碰 ;
+ }
+ if (data.倒角_缺陷_崩边 !== undefined) {
+ count += data.倒角_缺陷_崩边 ;
+ }
+ if (data.倒角_缺陷_小崩边 !== undefined) {
+ count += data.倒角_缺陷_小崩边 ;
+ }
+ count_qt = data.倒角_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='减薄A'){
+ if(data.减薄A_count_notok){
+ if (data.减薄A_缺陷_黑圈不良 !== undefined) {
+ count += data.减薄A_缺陷_黑圈不良 ;
+ }
+ if (data.减薄A_缺陷_材料不良 !== undefined) {
+ count += data.减薄A_缺陷_材料不良 ;
+ }
+ if (data.减薄A_缺陷_黑雾 !== undefined) {
+ count += data.减薄A_缺陷_黑雾 ;
+ }
+ if (data.减薄A_缺陷_调机破损 !== undefined) {
+ count += data.减薄A_缺陷_调机破损 ;
+ }
+ if (data.减薄A_缺陷_人为磕碰 !== undefined) {
+ count += data.减薄A_缺陷_人为磕碰 ;
+ }
+ if (data.减薄A_缺陷_崩边 !== undefined) {
+ count += data.减薄A_缺陷_崩边 ;
+ }
+ if (data.减薄A_缺陷_小崩边 !== undefined) {
+ count += data.减薄A_缺陷_小崩边 ;
+ }
+ count_qt = data.减薄A_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='减薄B'){
+ if(data.减薄B_count_notok){
+ if (data.减薄B_缺陷_黑圈不良 !== undefined) {
+ count += data.减薄B_缺陷_黑圈不良 ;
+ }
+ if (data.减薄B_缺陷_材料不良 !== undefined) {
+ count += data.减薄B_缺陷_材料不良 ;
+ }
+ if (data.减薄B_缺陷_黑雾 !== undefined) {
+ count += data.减薄B_缺陷_黑雾 ;
+ }
+ if (data.减薄B_缺陷_调机破损 !== undefined) {
+ count += data.减薄B_缺陷_调机破损 ;
+ }
+ if (data.减薄B_缺陷_人为磕碰 !== undefined) {
+ count += data.减薄B_缺陷_人为磕碰 ;
+ }
+ if (data.减薄B_缺陷_崩边 !== undefined) {
+ count += data.减薄B_缺陷_崩边 ;
+ }
+ if (data.减薄B_缺陷_小崩边 !== undefined) {
+ count += data.减薄B_缺陷_小崩边 ;
+ }
+ count_qt = data.减薄B_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='磨抛前'){
+ if(data.磨抛_count_pn_jgqbl){
+ if (data.磨抛_加工前_缺陷_崩边 !== undefined) {
+ count += data.磨抛_加工前_缺陷_崩边 ;
+ }
+ if (data.磨抛_加工前_缺陷_小崩边 !== undefined) {
+ count += data.磨抛_加工前_缺陷_小崩边 ;
+ }
+ count_qt = data.扫边B_count_pn_jgqbl - count;
+ return count_qt;
+ }
+ }else if(type=='磨抛'){
+ if(data.磨抛_count_notok){
+ if (data.磨抛_缺陷_黑圈不良 !== undefined) {
+ count += data.磨抛_缺陷_黑圈不良 ;
+ }
+ if (data.磨抛_缺陷_材料不良 !== undefined) {
+ count += data.磨抛_缺陷_材料不良 ;
+ }
+ if (data.磨抛_缺陷_调机破损 !== undefined) {
+ count += data.磨抛_缺陷_调机破损 ;
+ }
+ if (data.磨抛_缺陷_人为磕碰 !== undefined) {
+ count += data.磨抛_缺陷_人为磕碰 ;
+ }
+ count_qt = data.磨抛_count_notok - count;
+ return count_qt;
+ }
+ }
+ else if(type=='一次超洗前'){
+ if(data.一次超洗_count_pn_jgqbl){
+ if (data.一次超洗_加工前_缺陷_崩边 !== undefined) {
+ count += data.一次超洗_加工前_缺陷_崩边 ;
+ }
+ if (data.一次超洗_加工前_缺陷_小崩边 !== undefined) {
+ count += data.一次超洗_加工前_缺陷_小崩边 ;
+ }
+ count_qt = data.扫边B_count_pn_jgqbl - count;
+ return count_qt;
+ }
+ }else if(type=='一次超洗'){
+ if(data.一次超洗_count_notok){
+ if (data.一次超洗_缺陷_黑圈不良 !== undefined) {
+ count += data.一次超洗_缺陷_黑圈不良 ;
+ }
+ if (data.一次超洗_缺陷_材料不良 !== undefined) {
+ count += data.一次超洗_缺陷_材料不良 ;
+ }
+ if (data.一次超洗_缺陷_调机破损 !== undefined) {
+ count += data.一次超洗_缺陷_调机破损 ;
+ }
+ if (data.一次超洗_缺陷_人为磕碰 !== undefined) {
+ count += data.一次超洗_缺陷_人为磕碰 ;
+ }
+ count_qt = data.一次超洗_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='二次超洗前'){
+ if(data.二次超洗_count_pn_jgqbl){
+ if (data.二次超洗_加工前_缺陷_崩边 !== undefined) {
+ count += data.二次超洗_加工前_缺陷_崩边 ;
+ }
+ if (data.二次超洗_加工前_缺陷_小崩边 !== undefined) {
+ count += data.二次超洗_加工前_缺陷_小崩边 ;
+ }
+ count_qt = data.扫边B_count_pn_jgqbl - count;
+ return count_qt;
+ }
+ }else if(type=='二次超洗'){
+ if(data.二次超洗_count_notok){
+ if (data.二次超洗_缺陷_黑圈不良 !== undefined) {
+ count += data.二次超洗_缺陷_黑圈不良 ;
+ }
+ if (data.二次超洗_缺陷_材料不良 !== undefined) {
+ count += data.二次超洗_缺陷_材料不良 ;
+ }
+ if (data.二次超洗_缺陷_调机破损 !== undefined) {
+ count += data.二次超洗_缺陷_调机破损 ;
+ }
+ if (data.二次超洗_缺陷_人为磕碰 !== undefined) {
+ count += data.二次超洗_缺陷_人为磕碰 ;
+ }
+ count_qt = data.二次超洗_count_notok - count;
return count_qt;
}
}
diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index 82f2f53b..55f471e2 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -371,6 +371,7 @@ export default {
that.mgroupOptions = res;
if(res.length==1){
that.form.recive_mgroup = res[0].id;
+ that.getUserList2();
}
})
},