diff --git a/src/views/statistics/statistics_bang.vue b/src/views/statistics/statistics_bang.vue
index a45a1d30..aae95dfe 100644
--- a/src/views/statistics/statistics_bang.vue
+++ b/src/views/statistics/statistics_bang.vue
@@ -106,7 +106,7 @@
- {{ scope.row.data.棒料成型_count_n_qt }}
+ {{ getCountQt(scope.row.data,'7车间') }}
@@ -138,7 +138,7 @@
- {{ scope.row.data.七车间入库_count_ok }}
+ {{ scope.row.data.七车间入库_count-scope.row.data.七车间入库_count_notok }}
@@ -173,7 +173,7 @@
- {{ scope.row.data.七车间入库_count_n_qt }}
+ {{ getCountQt(scope.row.data,'8车间') }}
@@ -188,7 +188,7 @@
- {{ scope.row.data.七车间入库_备注 }}
+ {{ scope.row.data.七车间入库_检验备注 }}
@@ -299,7 +299,7 @@
- {{ scope.row.data.六车间_粗中细磨_count_n_qt }}
+ {{ getCountQt(scope.row.data,'粗中细磨') }}
@@ -317,47 +317,47 @@
- {{ scope.row.data.六车间_粗中细磨_count_use }}
+ {{ scope.row.data.六车间_抛光_count_use }}
- {{ scope.row.data.六车间_粗中细磨_合格率 }}
+ {{ scope.row.data.六车间_抛光_合格率 }}
- {{ scope.row.data.六车间_粗中细磨_count_n_hs }}
+ {{ scope.row.data.六车间_抛光_count_n_hs }}
- {{ scope.row.data.六车间_粗中细磨_count_n_dl }}
+ {{ scope.row.data.六车间_抛光_count_n_dl }}
- {{ scope.row.data.六车间_粗中细磨_count_n_qp }}
+ {{ scope.row.data.六车间_抛光_count_n_qp }}
- {{ scope.row.data.六车间_粗中细磨_count_n_qt }}
+ {{ getCountQt(scope.row.data,'抛光') }}
- {{ scope.row.data.六车间_粗中细磨_count_notok }}
+ {{ scope.row.data.六车间_抛光_count_notok }}
- {{ scope.row.data.六车间_粗中细磨_日期 }}
+ {{ scope.row.data.六车间_抛光_日期 }}
- {{ scope.row.data.六车间_粗中细磨_操作人 }}
+ {{ scope.row.data.六车间_抛光_操作人 }}
@@ -438,7 +438,7 @@
- {{ scope.row.data.六车间中检_count_n_qt }}
+ {{ getCountQt(scope.row.data,'六车间中检') }}
@@ -448,7 +448,7 @@
- {{ scope.row.data.六车间中检_操作人 }}
+ {{ scope.row.data.六车间中检_检验人 }}
@@ -456,63 +456,63 @@
- {{ scope.row.data.成品检验_count }}
+ {{ scope.row.data.六车间生产入库_count }}
- {{ scope.row.data.成品检验_count_notok }}
+ {{ scope.row.data.六车间生产入库_count_notok }}
- {{ scope.row.data.成品检验_count_n_p }}
+ {{ scope.row.data.六车间生产入库_count_n_yp }}
- {{ scope.row.data.成品检验_count_n_d }}
+ {{ scope.row.data.六车间生产入库_count_n_d }}
- {{ scope.row.data.成品检验_count_n_hs }}
+ {{ scope.row.data.六车间生产入库_count_n_hs }}
- {{ scope.row.data.成品检验_count_n_zw }}
+ {{ scope.row.data.六车间生产入库_count_n_zw }}
- {{ scope.row.data.成品检验_count_n_qt }}
+ {{ getCountQt(scope.row.data,'六车间生产入库') }}
- {{ scope.row.data.成品检验_合格率 }}
+ {{ scope.row.data.六车间生产入库_合格率 }}
- {{ scope.row.data.成品检验_日期 }}
+ {{ scope.row.data.六车间生产入库_检验日期 }}
- {{ scope.row.data.成品检验_操作人 }}
+ {{ scope.row.data.六车间生产入库_检验人 }}
- {{ scope.row.data.六车间_批次生产合格率 }}
+ {{ scope.row.data.六车间_批次发货合格率 }}
- {{ scope.row.data.七车间_批次应出合格率 }}
+ {{ scope.row.data.七车间_批次发货合格率 }}
@@ -546,6 +546,124 @@ export default {
handleQuery(){
this.$refs.table.queryData(this.query);
},
+ getCountQt(data,type){
+ let count_qt = 0,count = 0;
+ if(type=='7车间'){
+ if(data.棒料成型_count_notok){
+ if (data.棒料成型_count_n_zw !== undefined) {
+ count += data.棒料成型_count_n_zw ;
+ }
+ if (data.棒料成型_count_n_zt !== undefined) {
+ count += data.棒料成型_count_n_zt ;
+ }
+ if (data.棒料成型_count_n_tw !== undefined) {
+ count += data.棒料成型_count_n_tw ;
+ }
+ if (data.棒料成型_count_n_qp !== undefined) {
+ count += data.棒料成型_count_n_qp ;
+ }
+ if (data.棒料成型_count_n_zz !== undefined) {
+ count += data.棒料成型_count_n_zz ;
+ }
+ if (data.棒料成型_count_n_b !== undefined) {
+ count += data.棒料成型_count_n_b ;
+ }
+ count_qt = data.棒料成型_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='8车间'){
+ if(data.七车间入库_count_notok){
+ if (data.七车间入库_count_n_zw !== undefined) {
+ count += data.七车间入库_count_n_zw ;
+ }
+ if (data.七车间入库_count_n_zt !== undefined) {
+ count += data.七车间入库_count_n_zt ;
+ }
+ if (data.七车间入库_count_n_tw !== undefined) {
+ count += data.七车间入库_count_n_tw ;
+ }
+ if (data.七车间入库_count_n_qp !== undefined) {
+ count += data.七车间入库_count_n_qp ;
+ }
+ if (data.七车间入库_count_n_b !== undefined) {
+ count += data.七车间入库_count_n_b ;
+ }
+ count_qt = data.七车间入库_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='粗中细磨'){
+ if(data.六车间_粗中细磨_count_notok){
+ if (data.六车间_粗中细磨_count_n_d !== undefined) {
+ count += data.六车间_粗中细磨_count_n_d ;
+ }
+ if (data.六车间_粗中细磨_count_n_w !== undefined) {
+ count += data.六车间_粗中细磨_count_n_w ;
+ }
+ if (data.六车间_粗中细磨_count_n_yp !== undefined) {
+ count += data.六车间_粗中细磨_count_n_yp ;
+ }
+ if (data.六车间_粗中细磨_count_n_dl !== undefined) {
+ count += data.六车间_粗中细磨_count_n_dl ;
+ }
+ count_qt = data.六车间_粗中细磨_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='抛光'){
+ if(data.六车间_抛光_count_notok){
+ if (data.六车间_抛光_count_n_hs !== undefined) {
+ count += data.六车间_抛光_count_n_hs ;
+ }
+ if (data.六车间_抛光_count_n_dl !== undefined) {
+ count += data.六车间_抛光_count_n_dl ;
+ }
+ if (data.六车间_抛光_count_n_qp !== undefined) {
+ count += data.六车间_抛光_count_n_qp ;
+ }
+ count_qt = data.六车间_抛光_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='六车间中检'){
+ if(data.六车间中检_count_notok){
+ if (data.六车间中检_count_n_hs !== undefined) {
+ count += data.六车间中检_count_n_hs ;
+ }
+ if (data.六车间中检_count_n_zw !== undefined) {
+ count += data.六车间中检_count_n_zw ;
+ }
+ if (data.六车间中检_count_n_zdd !== undefined) {
+ count += data.六车间中检_count_n_zdd ;
+ }
+ if (data.六车间中检_count_n_qp !== undefined) {
+ count += data.六车间中检_count_n_qp ;
+ }
+ if (data.六车间中检_count_n_bl !== undefined) {
+ count += data.六车间中检_count_n_bl ;
+ }
+ if (data.六车间中检_count_n_qx !== undefined) {
+ count += data.六车间中检_count_n_qx ;
+ }
+ count_qt = data.六车间中检_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='六车间生产入库'){
+ if(data.六车间生产入库_count_notok){
+ if (data.六车间生产入库_count_n_yp !== undefined) {
+ count += data.六车间生产入库_count_n_yp ;
+ }
+ if (data.六车间生产入库_count_n_d !== undefined) {
+ count += data.六车间生产入库_count_n_d ;
+ }
+ if (data.六车间生产入库_count_n_hs !== undefined) {
+ count += data.六车间生产入库_count_n_hs ;
+ }
+ if (data.六车间生产入库_count_n_zw !== undefined) {
+ count += data.六车间生产入库_count_n_zw ;
+ }
+ count_qt = data.六车间生产入库_count_notok - count;
+ return count_qt;
+ }
+ }
+ }
},
};
diff --git a/src/views/statistics/statistics_guan.vue b/src/views/statistics/statistics_guan.vue
index 03659d9f..c672a35e 100644
--- a/src/views/statistics/statistics_guan.vue
+++ b/src/views/statistics/statistics_guan.vue
@@ -112,7 +112,7 @@
- {{ scope.row.data.管料成型_count_n_qt }}
+ {{ getCountQt(scope.row.data,'管料成型') }}
@@ -179,7 +179,7 @@
- {{ scope.row.data.十车间入库_count_n_qt }}
+ {{getCountQt(scope.row.data,'十车间入库')}}
@@ -188,7 +188,69 @@
-
+
+
+
+ {{ scope.row.data.管料退火_日期 }}
+
+
+
+
+ {{ scope.row.data.管料退火_count_use }}
+
+
+
+
+ {{ scope.row.data.管料退火_count_ok }}
+
+
+
+
+ {{ scope.row.data.管料退火_合格率 }}
+
+
+
+
+ {{ scope.row.data.管料退火_count_notok }}
+
+
+
+
+ {{ scope.row.data.管料退火_count_n_xzp }}
+
+
+
+
+ {{ scope.row.data.管料退火_count_n_thhs }}
+
+
+
+
+ {{ scope.row.data.管料退火_count_n_hs }}
+
+
+
+
+ {{ scope.row.data.管料退火_count_n_js }}
+
+
+
+
+ {{ scope.row.data.管料退火_count_n_qx }}
+
+
+
+
+ {{getCountQt(scope.row.data,'管料退火')}}
+
+
+
+
+ {{ scope.row.data.管料退火_操作人 }}
+
+
+
+
@@ -376,7 +376,7 @@
- {{ scope.row.data.六车间_开槽_count_n_qt }}
+ {{getCountQt(scope.row.data,'开槽')}}
@@ -418,7 +418,7 @@
- {{ scope.row.data.六车间_倒角_count_n_qt }}
+ {{getCountQt(scope.row.data,'倒角')}}
@@ -497,7 +497,7 @@
- {{ scope.row.data.六车间中检_count_n_qt }}
+ {{getCountQt(scope.row.data,'六车间中检')}}
@@ -514,48 +514,48 @@
- {{ scope.row.data.成品检验_count }}
+ {{ scope.row.data.销售发货_count + scope.row.data.六车间生产入库_count_notok }}
- {{ scope.row.data.成品检验_合格率 }}
+ {{ scope.row.data.六车间生产入库_合格率 }}
- {{ scope.row.data.成品检验_count_notok }}
+ {{ scope.row.data.六车间生产入库_count_notok }}
- {{ scope.row.data.成品检验_count_n_hs }}
+ {{ scope.row.data.六车间生产入库_count_n_hs }}
- {{ scope.row.data.成品检验_count_n_zw }}
+ {{ scope.row.data.六车间生产入库_count_n_zw }}
- {{ scope.row.data.成品检验_count_n_qt }}
+ {{getCountQt(scope.row.data,'六车间生产入库')}}
- {{ scope.row.data.成品检验_日期 }}
+ {{ scope.row.data.六车间生产入库_检验日期 }}
- {{ scope.row.data.成品检验_检验人 }}
+ {{ scope.row.data.六车间生产入库_检验人 }}
- {{ scope.row.data.六车间_批次生产合格率 }}
+ {{ scope.row.data.七车间_批次发货合格率 }}
@@ -587,6 +587,164 @@ export default {
handleQuery(){
this.$refs.table.queryData(this.query);
},
+ getCountQt(data,type){
+ let count_qt = 0,count = 0;
+ if(type=='管料成型'){
+ if(data.管料成型_count_notok){
+ if (data.管料成型_count_n_wq !== undefined) {
+ count += data.管料成型_count_n_wq ;
+ }
+ if (data.管料成型_count_n_tw !== undefined) {
+ count += data.管料成型_count_n_tw ;
+ }
+ if (data.管料成型_count_n_dl !== undefined) {
+ count += data.管料成型_count_n_dl ;
+ }
+ if (data.管料成型_count_n_pb !== undefined) {
+ count += data.管料成型_count_n_pb ;
+ }
+ if (data.管料成型_count_n_dxt !== undefined) {
+ count += data.管料成型_count_n_dxt ;
+ }
+ if (data.管料成型_count_n_js !== undefined) {
+ count += data.管料成型_count_n_js ;
+ }
+ if (data.管料成型_count_n_qx !== undefined) {
+ count += data.管料成型_count_n_qx ;
+ }
+ count_qt = data.管料成型_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='十车间入库'){
+ if(data.十车间入库_count_notok){
+ if (data.十车间入库_count_n_wq !== undefined) {
+ count += data.十车间入库_count_n_wq ;
+ }
+ if (data.十车间入库_count_n_tw !== undefined) {
+ count += data.十车间入库_count_n_tw ;
+ }
+ if (data.十车间入库_count_n_dl !== undefined) {
+ count += data.十车间入库_count_n_dl ;
+ }
+ if (data.十车间入库_count_n_pb !== undefined) {
+ count += data.十车间入库_count_n_pb ;
+ }
+ if (data.十车间入库_count_n_dxt !== undefined) {
+ count += data.十车间入库_count_n_dxt ;
+ }
+ if (data.十车间入库_count_n_js !== undefined) {
+ count += data.十车间入库_count_n_js ;
+ }
+ if (data.十车间入库_count_n_qx !== undefined) {
+ count += data.十车间入库_count_n_qx ;
+ }
+ count_qt = data.十车间入库_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='十车间入库'){
+ if(data.十车间入库_count_notok){
+ if (data.十车间入库_count_n_wq !== undefined) {
+ count += data.十车间入库_count_n_wq ;
+ }
+ if (data.十车间入库_count_n_tw !== undefined) {
+ count += data.十车间入库_count_n_tw ;
+ }
+ if (data.十车间入库_count_n_dl !== undefined) {
+ count += data.十车间入库_count_n_dl ;
+ }
+ if (data.十车间入库_count_n_pb !== undefined) {
+ count += data.十车间入库_count_n_pb ;
+ }
+ if (data.十车间入库_count_n_dxt !== undefined) {
+ count += data.十车间入库_count_n_dxt ;
+ }
+ if (data.十车间入库_count_n_js !== undefined) {
+ count += data.十车间入库_count_n_js ;
+ }
+ if (data.十车间入库_count_n_qx !== undefined) {
+ count += data.十车间入库_count_n_qx ;
+ }
+ count_qt = data.十车间入库_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='管料退火'){
+ if(data.管料退火_count_notok){
+ if (data.管料退火_count_n_xzp !== undefined) {
+ count += data.管料退火_count_n_xzp ;
+ }
+ if (data.管料退火_count_n_thhs !== undefined) {
+ count += data.管料退火_count_n_thhs ;
+ }
+ if (data.管料退火_count_n_hs !== undefined) {
+ count += data.管料退火_count_n_hs ;
+ }
+ if (data.管料退火_count_n_js !== undefined) {
+ count += data.管料退火_count_n_js ;
+ }
+ if (data.管料退火_count_n_qx !== undefined) {
+ count += data.管料退火_count_n_qx ;
+ }
+ count_qt = data.管料退火_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='开槽'){
+ if(data.六车间_开槽_count_notok){
+ if (data.六车间_开槽_count_n_dl !== undefined) {
+ count += data.六车间_开槽_count_n_dl ;
+ }
+ count_qt = data.六车间_开槽_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='倒角'){
+ if(data.六车间_倒角_count_notok){
+ if (data.六车间_倒角_count_n_dl !== undefined) {
+ count += data.六车间_倒角_count_n_dl ;
+ }
+ count_qt = data.六车间_倒角_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='六车间中检'){
+ if(data.六车间中检_count_notok){
+ if (data.六车间中检_count_n_hs !== undefined) {
+ count += data.六车间中检_count_n_hs ;
+ }
+ if (data.六车间中检_count_n_zz !== undefined) {
+ count += data.六车间中检_count_n_zz ;
+ }
+ if (data.六车间中检_count_n_zdd !== undefined) {
+ count += data.六车间中检_count_n_zdd ;
+ }
+ if (data.六车间中检_count_n_zw !== undefined) {
+ count += data.六车间中检_count_n_zw ;
+ }
+ if (data.六车间中检_count_n_qp !== undefined) {
+ count += data.六车间中检_count_n_qp ;
+ }
+ if (data.六车间中检_count_n_bl !== undefined) {
+ count += data.六车间中检_count_n_bl ;
+ }
+ if (data.六车间中检_count_n_hw !== undefined) {
+ count += data.六车间中检_count_n_hw ;
+ }
+ if (data.六车间中检_count_n_yp !== undefined) {
+ count += data.六车间中检_count_n_yp ;
+ }
+ count_qt = data.六车间中检_count_notok - count;
+ return count_qt;
+ }
+ }else if(type=='六车间生产入库'){
+ if(data.六车间生产入库_count_notok){
+ if (data.六车间生产入库_count_n_hs !== undefined) {
+ count += data.六车间生产入库_count_n_hs ;
+ }
+ if (data.六车间生产入库_count_n_zw !== undefined) {
+ count += data.六车间生产入库_count_n_zw ;
+ }
+ count_qt = data.六车间生产入库_count_notok - count;
+ return count_qt;
+ }
+ }
+ }
},
};