002390 1 年之前
父節點
當前提交
55ef707754
共有 2 個文件被更改,包括 39 次插入15 次删除
  1. 17 12
      src/views/purchase/purchase-order/print/index.vue
  2. 22 3
      src/views/purchase/purchase-order/see/index.vue

+ 17 - 12
src/views/purchase/purchase-order/print/index.vue

@@ -163,6 +163,10 @@ export default {
       type: [String, Number],
       type: [String, Number],
       require: true,
       require: true,
     },
     },
+    value:{
+      type:Object,
+      require:true
+    }
   },
   },
   data() {
   data() {
     return {
     return {
@@ -205,7 +209,8 @@ export default {
         standard: "",
         standard: "",
         extarCss: "",
         extarCss: "",
       },
       },
-      params: {},
+      // params: {},
+      params: this.value,
     };
     };
   },
   },
   computed: {
   computed: {
@@ -249,17 +254,17 @@ export default {
     },
     },
   },
   },
   async created() {
   async created() {
-    try {
-      this.disabled = true;
-      const { data, code } = await PRINT({ id: this.$props.id || 628 });
-      if (code === 200) {
-        this.params = data;
-        this.disabled = false;
-      }
-    } catch (err) {
-      alert(err);
-    } finally {
-    }
+    // try {
+    //   this.disabled = true;
+    //   const { data, code } = await PRINT({ id: this.$props.id || 628 });
+    //   if (code === 200) {
+    //     this.params = data;
+    //     this.disabled = false;
+    //   }
+    // } catch (err) {
+    //   alert(err);
+    // } finally {
+    // }
   },
   },
   mounted() {},
   mounted() {},
   destroyed() {},
   destroyed() {},

+ 22 - 3
src/views/purchase/purchase-order/see/index.vue

@@ -8,6 +8,7 @@ import {
 } from "@/utils/init/index.js";
 } from "@/utils/init/index.js";
 import { Columns, TabColumns } from "../add/column";
 import { Columns, TabColumns } from "../add/column";
 import orderApi from "@/api/business/purchase/purchase-order";
 import orderApi from "@/api/business/purchase/purchase-order";
+import { PRINT } from "@/api/business/purchase/task";
 
 
 const NewColumns = initColumns(Columns);
 const NewColumns = initColumns(Columns);
 const NewTabColumns = TabColumns.map((element) => ({
 const NewTabColumns = TabColumns.map((element) => ({
@@ -33,6 +34,7 @@ export default {
       visible: false,
       visible: false,
       loading: false,
       loading: false,
       columns: NewColumns,
       columns: NewColumns,
+      printData:{},
       rules: initRules(NewColumns),
       rules: initRules(NewColumns),
       params: {
       params: {
         ...initParams(NewColumns),
         ...initParams(NewColumns),
@@ -73,6 +75,18 @@ export default {
       } finally {
       } finally {
         this.loading = false;
         this.loading = false;
       }
       }
+
+      try {
+          this.loading = true;
+          const { data, code } = await PRINT({ id: this.params.id || 628 });
+          if (code === 200) {
+            this.printData = data;
+            this.loading = false;
+          }
+        } catch (err) {
+          alert(err);
+        } finally {
+        }
     },
     },
     // 取 消
     // 取 消
     handleCancel() {
     handleCancel() {
@@ -120,9 +134,13 @@ export default {
 
 
       return false;
       return false;
     },
     },
-    beforeOpen() { },
+    beforeOpen() { 
+      
+    },
+  },
+  created() { 
+
   },
   },
-  created() { },
   mounted() { },
   mounted() { },
   destroyed() { },
   destroyed() { },
 };
 };
@@ -158,7 +176,8 @@ export default {
           ">
           ">
           <h3>查看</h3>
           <h3>查看</h3>
           <div style="text-align: right">
           <div style="text-align: right">
-            <FilePrint :id="params.id"></FilePrint>
+            <!-- <FilePrint :id="params.id"></FilePrint> -->
+            <FilePrint v-model="printData"></FilePrint>
             <el-button size="mini" @click="handleRefresh">刷新</el-button>
             <el-button size="mini" @click="handleRefresh">刷新</el-button>
             <template v-if="judgeIsToNC()">
             <template v-if="judgeIsToNC()">
               <el-tooltip
               <el-tooltip