修改报表空白 放箱号新加创建功能

src/views/approveDataH/index.vue

@@ -101,7 +101,7 @@
       </check>
     </el-dialog>
     <!--报表+审批-->
-    <reportContainerlos style="width: 100%; height: 100vh" ref="reportContainer">
+    <reportContainerlos v-if="prinDia" style="width: 100%; height: 100vh" ref="reportContainer">
       <check :checkData="checkData" :checkDetail="true" :idList="idList" @operationType="operationType"
         @choceCheckFun="choceCheckFun">
       </check>
@@ -152,6 +152,7 @@ export default {
   },
   data() {
     return {
+      prinDia: false,
       selectPrintingDialog: false, // 打印弹窗
       reportsData: {}, // 当前要审核数据
       reportlist: [], // 报表数据
@@ -247,6 +248,7 @@ export default {
   methods: {
     // 点击审核弹出打印表格
     printWindowfun(row, type) {
+      this.prinDia = true
       // 当时选择的数据
       this.reportsData = row
       this.checkData = row
@@ -338,7 +340,7 @@ export default {
     // 获取报表数据
     reportRadio(val, type) {
       console.log(val, 240)
-      if (type == 'FYSQ'||type == 'FYSQ-C') {
+      if (type == 'FYSQ' || type == 'FYSQ-C') {
         reportsGetReportDataBox({
           billId: this.reportsData.srcBillId,
           reportCode: val.classifyCode,
@@ -452,6 +454,8 @@ export default {
 
       let that = this
       closeBtn.action = function () {
+        console.log('关闭报表')
+        that.prinDia = false
         console.log(that.$refs.ReportContainer)
         if (that.$refs.reportContainer)
           that.$refs.reportContainer.hideContainer()
@@ -510,7 +514,7 @@ export default {
           this.$router.push({
             path: row.url,
             query: {
-              billId: (row.checkType == 'FYSQ'||row.checkType == 'FYSQ-C') ? row.srcBillId : row.billId
+              billId: (row.checkType == 'FYSQ' || row.checkType == 'FYSQ-C') ? row.srcBillId : row.billId
             }
           });
         }
@@ -558,6 +562,7 @@ export default {
     },
     choceCheckFun() {
       // this.checkDialog = false;
+      this.prinDia = false
       this.$refs.reportContainer.visible = false
       this.refreshChange();
     },

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -276,6 +276,8 @@ export default {
       editButton: false,
       editDisabled: false,
       form: {
+        busType:'自有箱',
+        putBoxItemsList:[]
       },
       oldForm: {},
       optionForm: {

src/views/boxManagement/containerNumber/index.vue

@@ -8,8 +8,8 @@
                 @resetColumn="resetColumn('crud', 'option', 'optionBack', 459)"
                 @saveColumn="saveColumn('crud', 'option', 'optionBack', 459)" @on-load="onLoad">
                 <template slot="menuLeft">
-                    <!-- <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">新 增
-                    </el-button> -->
+                    <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">新 增
+                    </el-button>
                     <!-- <el-button type="warning" size="small" @click="outExport">导 出
                     </el-button> -->
                     <el-button type="success" size="small" :disabled="selectionList.length != 1"

src/views/iosBasicData/report-container/report-container.vue

@@ -1,6 +1,16 @@
 <template>
-  <el-dialog :visible.sync="visible" top="0" width="100%" height="100%" style="width: 100%; height: 100%;"
-    :before-close="onClose" :close-on-click-modal="false" append-to-body class="el-dialogDeep" :fullscreen="true">
+  <el-dialog
+    :visible.sync="visible"
+    top="0"
+    width="100%"
+    height="100%"
+    style="width: 100%; height: 100%;"
+    :before-close="onClose"
+    :close-on-click-modal="false"
+    append-to-body
+    class="el-dialogDeep"
+    :fullscreen="true"
+  >
     <div v-if="reportType" id="reportContainer" style="width: 100%; height: 100vh; padding: 0">
     </div>
   </el-dialog>
@@ -12,7 +22,7 @@ export default {
     return {
       visible: false,
       refreshFun: null,
-      reportType: false, // 通过判断处理数据
+      reportType:false, // 通过判断处理数据
     };
   },
   props: {