国内贸易修改

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -188,7 +188,7 @@
                          v-if="goodsActives == 'gift'"
               >录入明细
               </el-button>
-              <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
+              <el-button type="info" :size="size" icon="el-icon-printer" @click.stop="openReport()">报 表</el-button>
               <el-button
                 type="warning"
                 icon="el-icon-refresh"
@@ -445,6 +445,12 @@
       >
       </market-detail>
     </el-dialog>
+    <report-dialog
+      :switchDialog="switchDialog"
+      :reportId="form.id"
+      reportName="客户收货确认"
+      @onClose="onClose()"
+    ></report-dialog>
   </div>
 </template>
 
@@ -480,6 +486,7 @@ import {
   micrometerFormat,
   IntegerFormat
 } from "@/util/validate";
+import reportDialog from "@/components/report-dialog/main";
 
 export default {
   name: "detailsPage",
@@ -491,6 +498,7 @@ export default {
   components: {
     marketDetail,
     feeInfo,
+    reportDialog,
   },
   data() {
     return {
@@ -842,6 +850,7 @@ export default {
       deliverDisabled: false,
       // 确认到货禁用
       arrivalDisabled: false,
+      switchDialog: false,
     }
   },
   mounted() {
@@ -1935,6 +1944,13 @@ export default {
         },500)
       }
     },
+    // 报表
+    openReport() {
+      this.switchDialog =! this.switchDialog;
+    },
+    onClose(val) {
+      this.switchDialog = val;
+    },
   }
 }
 </script>

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -221,7 +221,7 @@
                          :disabled="selection.length < 1 || detailData.seeDisabled"
                          @click="getShipmentC">生成采购确认
               </el-button>
-              <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
+              <el-button type="info" :size="size" icon="el-icon-printer" @click.stop="openReport()">报 表</el-button>
             </template>
           </avue-crud>
         </basic-container>
@@ -507,6 +507,12 @@
       >
       </bill-application>
     </el-dialog>
+    <report-dialog
+      :switchDialog="switchDialog"
+      :reportId="form.id"
+      reportName="发货通知单"
+      @onClose="onClose()"
+    ></report-dialog>
   </div>
 </template>
 
@@ -543,6 +549,7 @@ import {
   IntegerFormat
 } from "@/util/validate";
 import financialAccount from "../../../components/finance/financialAccount";
+import reportDialog from "@/components/report-dialog/main";
 
 export default {
   name: "detailsPage",
@@ -558,7 +565,8 @@ export default {
     ApplyPayment,
     billApplication,
     feeInfo,
-    financialAccount
+    financialAccount,
+    reportDialog,
   },
   data() {
     return {
@@ -823,6 +831,7 @@ export default {
       },
       itemType: '采购',
       packageOptions: [],
+      switchDialog: false,
     }
   },
   mounted() {
@@ -1630,6 +1639,13 @@ export default {
       params.srcOrderno = this.form.orderNo
       callback(params)
     },
+    // 报表
+    openReport() {
+      this.switchDialog =! this.switchDialog;
+    },
+    onClose(val) {
+      this.switchDialog = val;
+    },
   }
 }
 </script>

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -3084,6 +3084,7 @@ export default {
           this.pageLoading = true
           pleaseCheck(data).then(res => {
             // this.pageLoading = false
+            this.saveActives = ''
             this.queryData(this.form.id)
           }).finally(() => {
             this.pageLoading = false