diff --git a/src/api/board.js b/src/api/board.js
index e6df73e..af2adf2 100644
--- a/src/api/board.js
+++ b/src/api/board.js
@@ -4,8 +4,8 @@ export const getTime=data => createAPI(`board/getTime`, 'post', data);
 
 export const kanKanYouMeiYouDiaoXian=data => createAPI(`board/kanKanYouMeiYouDiaoXian`, 'post', data);
 
-export const getNewScheduledTableData=data => createAPI(`board/getNewScheduledTableData`, 'post', data);
+export const getNewScheduledTableData=data => createAPI(`board/getNewScheduledTableData/${data}`, 'get');
 
-export const getRefreshTime=data => createAPI(`board/getRefreshTime`, 'post', data);
+export const getRefreshTime=data => createAPI(`board/getRefreshTime/${data}`, 'get');
 
 export const getScheduledData=data => createAPI(`board/getScheduledData`, 'post', data);
diff --git a/src/assets/img/factory.jpg b/src/assets/img/factory.jpg
new file mode 100644
index 0000000..1e08684
Binary files /dev/null and b/src/assets/img/factory.jpg differ
diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index 0d86942..e476081 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -375,15 +375,15 @@ a:hover{
 
 /* 颜色控制 */
 .mainTable .el-table .customer-row-1 {
-  background: #FF00FF;
+  background: #d99292;
 }
 
 .mainTable .el-table .customer-row-2  {
-  background: #FFD700;
+  background: #e2dd9d;
 }
 
 .mainTable .el-table .customer-row-3  {
-  background: #0000CD;
+  background: #9494c6;
 }
 .sl-input {
   background-color: transparent;
@@ -404,15 +404,15 @@ div.customer-el-card {
 }
 /* 颜色控制 */
 div.customer-el-card-pink {
-  background: #FF00FF;
+  background: #d99292;
 }
 
 div.customer-el-card-orange {
-  background: #FFD700;
+  background: #e2dd9d;
 }
 
 div.customer-el-card-blue {
-  background: #0000CD;
+  background: #9494c6;
 }
 
 /*针对el-card*/
diff --git a/src/views/modules/board/newScheduledBoard.vue b/src/views/modules/board/newScheduledBoard.vue
index 68e06b0..676eab1 100644
--- a/src/views/modules/board/newScheduledBoard.vue
+++ b/src/views/modules/board/newScheduledBoard.vue
@@ -1,11 +1,11 @@
 <template>
-    <div class="container">
+    <div class="container" >
         <div style="width:100%;height: 20%;text-align:center;">
             <TimeC></TimeC>
             <!--      <div style="font-size: 26px;float: right;color: #ffffff;height: 100%" v-html="clock"></div>-->
             <div style="float: left;width: 25%;height: 100%;text-align:center;margin-left: 37% ">
                 <div style="height: 40%;width: 100%;text-align: center;margin-top: 3%;">
-                    <label style="font-size: 30px;color: #ffffff">派工单完成状况</label>
+                    <label style="font-size: 30px;color: #ffffff">生产状况</label>
                 </div>
                 <div style="height: 40%;width: 100%;text-align: center;margin-top: 0%;">
                     <label id="resourceIdName" style="font-size: 24px;color: #fff300"></label>
@@ -91,7 +91,7 @@
                 chartDom:null,
                 option2:null,
                 tableList:null,
-                pieList:null,
+                pieData:null,
                 barList:null,
                 resourceId:'',
                 height:200,
@@ -106,8 +106,10 @@
             searchData(){
                 this.getRefresh();
                 getScheduledData().then(({data}) => {
-                  this.pieList=data.pieList;
+                  this.pieData=data.pieData;
                   this.barList=data.barList;
+                  console.log(data.pieData)
+                  console.log(data.barList)
                     this.number2=0;
                     this.draw();
                     this.draw2()
@@ -153,7 +155,7 @@
                         }
                     },
                         {
-                            text: this.pieList[0].qtyPercent + '%',
+                            text: this.pieData.qtyPercent + '%',
                             // text: data_temp[i + x].percentage + '%',
                             // x 设置水平安放位置，默认左对齐，可选值：'center' ¦ 'left' ¦ 'right' ¦ {number}（x坐标，单位px）
                             x: 'center',
@@ -176,8 +178,8 @@
                             data: [          // 数据数组，name 为数据项名称，value 为数据项值
                                 // {value: data_temp[i + x].approveQty, name: ''},
                                 // {value: data_temp[i + x].unapproveQty, name: ''}
-                                {value: this.pieList[0].qtyReported, name: ''},
-                                {value: this.pieList[0].qtyUnReported, name: ''}
+                                {value: this.pieData.qtyReported, name: ''},
+                                {value: this.pieData.qtyUnReported, name: ''}
                             ],
                             color: ['#90ca75', '#ec6566'],
                             labelLine: {
@@ -204,25 +206,23 @@
               getNewScheduledTableData(this.number2).then(({data}) => {
                 this.tableList=data.rows;
               })
-
-
             },
-            // data(){
-            //     let arr=[]
-            //     let indata={
-            //         t1:'测试'
-            //     }
-            //     arr.push(indata);
-            //     arr.push(indata);
-            //     arr.push(indata);
-            //     let data2 = {"total": arr.length, "rows": arr};
-            //     $('#table').bootstrapTable('load', data2);
-            // },
-
             draw2(){
                 if (this.myChart2!=null) {
                     this.myChart2.clear()
                 }
+                let barData=[];
+              let valueData=[];
+              for (let a = 0; a <this.barList.length ; a++) {
+                  let resourceData={
+                    value: this.barList[a].resourceDesc,
+                    textStyle: {
+                      color: '#EEE'
+                    }
+                  }
+                barData.push(resourceData);
+                valueData[a]=this.barList[a].qtyPercent;
+              }
                 this.myChart2 = echarts.init(document.getElementById('main'));
                 // document.getElementById('main').style.height="300px";
                 // if(this.option2!=null){
@@ -242,50 +242,51 @@
                         {
                             type: 'category',
                             // data: xAxisData
-                            data: [
-                                {
-                                    value: this.getDate(this.barList[6].strDate),
-                                    textStyle: {
-                                        color: '#EEE'
-                                    }
-                                },
-                                {
-                                    value: this.getDate(this.barList[5].strDate),
-                                    textStyle: {
-                                        color: '#EEE'
-                                    }
-                                },
-                                {
-                                    value: this.getDate(this.barList[4].strDate),
-                                    textStyle: {
-                                        color: '#EEE'
-                                    }
-                                },
-                                {
-                                    value: this.getDate(this.barList[3].strDate),
-                                    textStyle: {
-                                        color: '#EEE'
-                                    }
-                                },
-                                {
-                                    value: this.getDate(this.barList[2].strDate),
-                                    textStyle: {
-                                        color: '#EEE'
-                                    }
-                                },
-                                {
-                                    value: this.getDate(this.barList[1].strDate),
-                                    textStyle: {
-                                        color: '#EEE'
-                                    }
-                                },
-                                {
-                                    value: this.getDate(this.barList[0].strDate),
-                                    textStyle: {
-                                        color: '#EEE'
-                                    }
-                                },
-                                ],
+                            data:barData,
+                              // [
+                              //   {
+                              //       value: this.getDate(this.barList[6].strDate),
+                              //       textStyle: {
+                              //           color: '#EEE'
+                              //       }
+                              //   },
+                              //   {
+                              //       value: this.getDate(this.barList[5].strDate),
+                              //       textStyle: {
+                              //           color: '#EEE'
+                              //       }
+                              //   },
+                              //   {
+                              //       value: this.getDate(this.barList[4].strDate),
+                              //       textStyle: {
+                              //           color: '#EEE'
+                              //       }
+                              //   },
+                              //   {
+                              //       value: this.getDate(this.barList[3].strDate),
+                              //       textStyle: {
+                              //           color: '#EEE'
+                              //       }
+                              //   },
+                              //   {
+                              //       value: this.getDate(this.barList[2].strDate),
+                              //       textStyle: {
+                              //           color: '#EEE'
+                              //       }
+                              //   },
+                              //   {
+                              //       value: this.getDate(this.barList[1].strDate),
+                              //       textStyle: {
+                              //           color: '#EEE'
+                              //       }
+                              //   },
+                              //   {
+                              //       value: this.getDate(this.barList[0].strDate),
+                              //       textStyle: {
+                              //           color: '#EEE'
+                              //       }
+                              //   },
+                              //   ],
                             axisLine:{
                                 lineStyle: {
                                     color:'#eee'
@@ -302,25 +303,8 @@
                     yAxis:[
                         {
                             type: 'value',
-                            axisLine:{
-
-                                lineStyle: {
-                                    color:'#eee'
-                                }
-                            },
-                            axisTick: {
-                                lineStyle: {
-                                    color:'#eee'
-                                }
-                            },
-                            splitLine:{
-                                show:false,
-                            }
-                        },
-                        {
-                            type: 'value',
-                            // min: 0,
-                            // max: 100,
+                            min: 0,
+                            max: 100,
                             axisLabel: {
                                 formatter: '{value} %'
                             },
@@ -343,13 +327,14 @@
                     series: [
 
                         {
-                            'name': '白班产量',
+                            'name': '当日完成率',
                             'type': 'bar',
                             'emphasis': {
                                 focus: 'series'
                             },
                             // data: seriesData1
-                            'data': [this.barList[6].num1, this.barList[5].num1, this.barList[4].num1, this.barList[3].num1, this.barList[2].num1, this.barList[1].num1, this.barList[0].num1],
+                            'data': valueData,
+                              // [this.barList[6].num1, this.barList[5].num1, this.barList[4].num1, this.barList[3].num1, this.barList[2].num1, this.barList[1].num1, this.barList[0].num1],
                             'label':{
                                 show:true,
                                 position:'top',
@@ -360,41 +345,7 @@
                             },
 
                         },
-                        {
-                            'name': '晚班产量',
-                            'type': 'bar',
-                            'emphasis': {
-                                focus: 'series'
-                            },
-                            // data: seriesData2
-                            'data': [this.barList[6].num2, this.barList[5].num2, this.barList[4].num2, this.barList[3].num2, this.barList[2].num2, this.barList[1].num2, this.barList[0].num2],
-                            'label':{
-                                show:true,
-                                position:'top',
-                                textStyle: {
-                                    color: '#fff300',
-                                    fontSize: 11
-                                }
-                            },
-                        },
-                        {
-                            'name': '当日完成率',
-                            'type': 'line',
-                            yAxisIndex: 1,
-                            'emphasis': {
-                                focus: 'series'
-                            },
-                            // data: seriesData2
-                            'data': [this.barList[6].num3, this.barList[5].num3, this.barList[4].num3, this.barList[3].num3, this.barList[2].num3, this.barList[1].num3, this.barList[0].num3],
-                            // 'label':{
-                            //     show:true,
-                            //     position:'top',
-                            //     textStyle: {
-                            //         color: '#fff300',
-                            //         fontSize: 12
-                            //     }
-                            // },
-                        },
+
 
                     ]
                 };
@@ -407,29 +358,40 @@
             },
             timeDo(){
                 let that=this;
-                $.ajax({
-                    url: "/board/getRefreshTime",
-                    type: "post",
-                    data: {"boardName": 'newScheduledBoard'},
-                    dataType: "json",
-                    success: (data) => {
-                        if (data.rows != "" && data.rows != null) {
-                            that.refreshTime = Number(data.rows);
-                            if(that.refreshTime ==0){
-                                that.refreshTime =5;
-                            }
-                        }else {
-                            that.refreshTime =5;
-                        }
-                        console.log(4000*Number(that.refreshTime))
-                        window.setInterval(() => {
-                            this.searchData();
-                        }, 4000*Number(that.refreshTime));
-                    },
-                })
+              getRefreshTime('scheduledBoard').then(({data}) => {
+                if (data.rows != "" && data.rows != null) {
+                  that.refreshTime = Number(data.rows);
+                  if(that.refreshTime ==0){
+                    that.refreshTime =5;
+                  }
+                }else {
+                  that.refreshTime =5;
+                }
+                window.setInterval(() => {
+                  this.searchData();
+                }, 4000*Number(that.refreshTime));
+              })
+                // $.ajax({
+                //     url: "/board/getRefreshTime",
+                //     type: "post",
+                //     data: {"boardName": 'newScheduledBoard'},
+                //     dataType: "json",
+                //     success: (data) => {
+                //         if (data.rows != "" && data.rows != null) {
+                //             that.refreshTime = Number(data.rows);
+                //             if(that.refreshTime ==0){
+                //                 that.refreshTime =5;
+                //             }
+                //         }else {
+                //             that.refreshTime =5;
+                //         }
+                //         window.setInterval(() => {
+                //             this.searchData();
+                //         }, 4000*Number(that.refreshTime));
+                //     },
+                // })
             },
             // getIp(){
-            //     console.log(localStorage.getItem("tvIP"))
             //     let that=this;
             //     if (localStorage.getItem("tvIP")==null||localStorage.getItem("tvIP")==""||localStorage.getItem("tvIP")=="192.168.1.130") {
             //         $.ajax({
@@ -460,15 +422,14 @@
             //
             // },
             getRefresh(){
-                let that=this;
-                getRefreshTime("scheduledBoard").then(({data}) => {
+                getRefreshTime('scheduledBoard').then(({data}) => {
                 if (data.rows != "" && data.rows != null) {
-                  that.refreshTime = Number(data.rows);
+                  this.refreshTime = Number(data.rows);
                   if(this.refreshTime ==0){
                     this.refreshTime =5;
                   }
                 }else {
-                  that.refreshTime =5;
+                  this.refreshTime =5;
                 }
               })
             },
@@ -488,10 +449,19 @@
     }
 </script>
 
-<<style scoped>
-    /*.container {*/
-    /*    height: 109%;*/
-    /*}*/
+<<style >
+    .container {
+      height: 109%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      z-index: -1;
+      width: 100%;
+      height: 100%;
+      content: "";
+      background-image: url(~@/assets/img/factory.jpg);
+      background-size: cover;
+    }
     .board .el-table .cell {
       line-height: 20px;
       font-size: 20px;
@@ -499,4 +469,25 @@
       padding: 0px;
       color: yellow;
     }
+
+    /* 表格内背景颜色 */
+    .board .el-table th, .el-table tr,.el-table td{
+      border: 0;
+      background-color: transparent;
+    }
+    /* 使表格背景透明 */
+    .board .el-table th, .el-table tr {
+      background-color: transparent;
+    }
+    /* 删除表格下横线 */
+    .board .el-table::before {
+      left: 0;
+      bottom: 0;
+      width: 100%;
+      height: 0px;
+    }
+    /* 表格表头字体颜色 */
+    .board .el-table, .el-table__expanded-cell {
+      background-color: transparent;
+    }
 </style>
diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
index b65face..d8eccb3 100644
--- a/src/views/modules/production/dailyPlan.vue
+++ b/src/views/modules/production/dailyPlan.vue
@@ -30,7 +30,8 @@
         <el-form-item label="产成品名称">
           <el-input v-model="searchData.partDesc" style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="客户名称">
+        <el-form-item >
+          <span slot="label" style="" @click="getBaseList(12,1)"><a herf="#">客户名称：</a></span>
           <el-input v-model="searchData.customerName" style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
@@ -213,7 +214,7 @@
           header-align="center"
           align="right"
           min-width="80"
-          label="已报工数量">
+          label="已入库数量">
         </el-table-column>
         <el-table-column
           prop="enterDate"
@@ -424,7 +425,7 @@
           header-align="center"
           align="right"
           min-width="80"
-          label="已报告数量">
+          label="已入库数量">
         </el-table-column>
         <el-table-column
           prop="resourceId"
@@ -899,6 +900,9 @@
             this.searchData.resourceId = val.ResourceID
           }
         }
+        if (this.tagNo === 12) {
+          this.searchData.customerName = val.CustomerName
+        }
       },
       // 获取基础数据列表
       getBaseList (val, val2) {
@@ -906,6 +910,9 @@
         this.tagNo2 = val2
         this.$nextTick(() => {
           let strVal = ''
+          if (val === 12){
+            strVal = this.searchData.customerName
+          }
           if (val === 24) {
             if (val2 === 1) {
               strVal = this.searchData.workCenterNo
diff --git a/src/views/modules/production/print_serialNo_label.js b/src/views/modules/production/print_serialNo_label.js
index a0cfdf4..bc5182a 100644
--- a/src/views/modules/production/print_serialNo_label.js
+++ b/src/views/modules/production/print_serialNo_label.js
@@ -12,11 +12,12 @@ export function printMaterialLabel(printList) {
       let printData = printList[i];
       LODOP.NewPage();
       LODOP.SET_PRINT_PAGESIZE(0,300,200,"");
-      LODOP.ADD_PRINT_TEXT(54,11,82,20,printData.serialNo);
+      LODOP.ADD_PRINT_TEXT(52,21,72,35,printData.serialNo);
       LODOP.SET_PRINT_STYLEA(0,"FontName","黑体");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",9);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-      LODOP.ADD_PRINT_BARCODE(7,31,86,61,"QRCode",printData.serialNo);
+      LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
+      LODOP.ADD_PRINT_BARCODE(3,31,86,61,"QRCode",printData.serialNo);
 
     }
     // LODOP.PRINT_DESIGN();
diff --git a/src/views/modules/production/search_schedule.vue b/src/views/modules/production/search_schedule.vue
index 7e3c808..2e30769 100644
--- a/src/views/modules/production/search_schedule.vue
+++ b/src/views/modules/production/search_schedule.vue
@@ -36,6 +36,13 @@
       <el-form-item label="客户名称">
         <el-input v-model="searchData.customerName" style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'是否打印：'">
+        <el-select filterable v-model="searchData.printFlag" style="width: 80px">
+          <el-option label="是" value="Y"></el-option>
+          <el-option label="否" value="N"></el-option>
+          <el-option label="全部" value=""></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="''" style="margin-left: -5px;">
         <el-checkbox style="margin-top: 20px;" true-label="Y" false-label="N" v-model="searchData.closedFlag">显示已关闭计划
         </el-checkbox>
@@ -69,11 +76,12 @@
       <el-form-item :label="'未关闭,未达数量'">
         <el-card class="customer-el-card customer-el-card-blue" style="margin-left:100px"></el-card>
       </el-form-item>
+<!--      :row-class-name="routingRowClassName2"-->
       <div class="mainTable">
         <el-table :height="height"
                 :data="dataList"
-                :row-class-name="routingRowClassName2"
                 border
+                :row-class-name="routingRowClassName2"
                 v-loading="dataListLoading"
                 style="width: 100%;margin-top: -20px">
         <el-table-column
@@ -104,6 +112,12 @@
           </template>
         </el-table-column>
       </el-table>
+        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+          <span>合计：排产数量</span>
+          <el-input v-model="sum1" readonly style="width: 60px"></el-input>
+          <span>已入库数量</span>
+          <el-input v-model="sum2" readonly style="width: 60px"></el-input>
+        </el-form>
       </div>
     </el-form>
 
@@ -141,6 +155,8 @@
     },
     data () {
       return {
+        sum1:'',
+        sum2:'',
         printModalFlag:false,
         printQty:'',
         // 导出 start
@@ -209,14 +225,14 @@
           {
             userId: this.$store.state.user.name,
             functionId: 5302,
-            serialNumber: '5302ProduceItemNo',
+            serialNumber: '5302ProducePartNo',
             tableId: "5302Produce",
             tableName: "待生产工单",
-            columnProp: "itemNo",
+            columnProp: "partNo",
             headerAlign: "center",
-            align: "right",
-            columnLabel: "工序号",
-            columnWidth: 50,
+            align: "left",
+            columnLabel: "产品编码",
+            columnWidth: 110,
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -227,14 +243,14 @@
           {
             userId: this.$store.state.user.name,
             functionId: 5302,
-            serialNumber: '5302ProduceItemDesc',
+            serialNumber: '5302ProducePartDesc',
             tableId: "5302Produce",
             tableName: "待生产工单",
-            columnProp: "itemDesc",
+            columnProp: "partDesc",
             headerAlign: "center",
             align: "left",
-            columnLabel: "工序描述",
-            columnWidth: 80,
+            columnLabel: "产品名称",
+            columnWidth: 180,
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -335,14 +351,14 @@
           {
             userId: this.$store.state.user.name,
             functionId: 5302,
-            serialNumber: '5302ProducePartNo',
+            serialNumber: '5302ProduceCustomerName',
             tableId: "5302Produce",
             tableName: "待生产工单",
-            columnProp: "partNo",
+            columnProp: "customerName",
             headerAlign: "center",
             align: "left",
-            columnLabel: "产品编码",
-            columnWidth: 110,
+            columnLabel: "客户名称",
+            columnWidth: 180,
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -353,13 +369,13 @@
           {
             userId: this.$store.state.user.name,
             functionId: 5302,
-            serialNumber: '5302ProducePartDesc',
+            serialNumber: '5302ProduceTechInfo',
             tableId: "5302Produce",
             tableName: "待生产工单",
-            columnProp: "partDesc",
+            columnProp: "techInfo",
             headerAlign: "center",
             align: "left",
-            columnLabel: "产品名称",
+            columnLabel: "技术注意事项",
             columnWidth: 180,
             columnHidden: false,
             columnImage: false,
@@ -371,14 +387,32 @@
           {
             userId: this.$store.state.user.name,
             functionId: 5302,
-            serialNumber: '5302ProduceCustomerName',
+            serialNumber: '5302ProduceItemNo',
             tableId: "5302Produce",
             tableName: "待生产工单",
-            columnProp: "customerName",
+            columnProp: "itemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "工序号",
+            columnWidth: 50,
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 5302,
+            serialNumber: '5302ProduceItemDesc',
+            tableId: "5302Produce",
+            tableName: "待生产工单",
+            columnProp: "itemDesc",
             headerAlign: "center",
             align: "left",
-            columnLabel: "客户名称",
-            columnWidth: 180,
+            columnLabel: "工序描述",
+            columnWidth: 80,
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -590,13 +624,14 @@
 
         ],
         searchData:{
+          printFlag:'',
           site:'',
           partNo:'',
           resourceId:'',
           date1:'',
           date2:'',
           orderNo:'',
-          closedFlag:'',
+          closedFlag:'N',
           customerName:'',
         },
         rowData:'',
@@ -604,7 +639,7 @@
     },
     mounted () {
       this.$nextTick(() => {
-        this.height = window.innerHeight - 175
+        this.height = window.innerHeight - 195
       })
     },
     methods: {
@@ -618,6 +653,7 @@
       getBaseList(val){
         this.tagNo = val
         this.$nextTick(() => {
+
           let strVal = "";
           if (val === 88){
             strVal =  this.searchData.resourceId
@@ -657,6 +693,15 @@
         getProduceScheduleList(this.searchData).then(({data}) => {
           //设置查询数据
           this.dataList = data.rows;
+          this.sum1=0;
+          this.sum2=0;
+          if(data.rows.length>0){
+            for (let i = 0; i < data.rows.length; i++) {
+              this.sum1=Number(this.sum1)+Number(data.rows[i].qtyRequired);
+              this.sum2=Number(this.sum2)+Number(data.rows[i].qtyReported);
+            }
+
+          }
         })
       },
       printAction (row) {
@@ -721,6 +766,7 @@
                 }
               }
               printMaterialLabel(array);
+              this.refreshTables()
               this.printModalFlag = false;
             }
           } else {