qukaidi hace 4 años
padre
commit
931c5573eb

+ 86 - 23
src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1141,8 +1141,8 @@
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="a">收货单</el-dropdown-item>
-                  <el-dropdown-item command="g">标准入库单</el-dropdown-item>
-                  <el-dropdown-item command="b">入库单</el-dropdown-item>
+                  <el-dropdown-item command="z">标准入库单</el-dropdown-item>
+                  <!-- <el-dropdown-item command="b">入库单</el-dropdown-item> -->
                   <el-dropdown-item command="c">理货单</el-dropdown-item>
                   <el-dropdown-item command="d">货物确认</el-dropdown-item>
                   <el-dropdown-item command="e">劳务确认</el-dropdown-item>
@@ -1764,7 +1764,7 @@
       :close-on-click-modal="false"
       :modal="false"
     >
-      <div id="print_area1" class="print-div">
+      <div id="print_area2" class="print-div">
         <div
           class="print-title"
           style="
@@ -1820,7 +1820,7 @@
           type="primary"
           :disabled="browseStatus"
           @click="
-            addprint();
+            addprint('shd');
             print_shd = false;
           "
           >打印
@@ -1834,7 +1834,7 @@
       :close-on-click-modal="false"
       :modal="false"
     >
-      <div id="print_area1" class="print-div">
+      <div id="print_area3" class="print-div">
         <div
           class="print-title"
           style="
@@ -1943,7 +1943,7 @@
           type="primary"
           :disabled="browseStatus"
           @click="
-            addprint();
+            addprint('rkd');
             print_rkd = false;
           "
           >打印
@@ -1957,7 +1957,7 @@
       :close-on-click-modal="false"
       :modal="false"
     >
-      <div id="print_area1" class="print-div">
+      <div id="print_area4" class="print-div">
         <div
           class="print-title"
           style="
@@ -1967,7 +1967,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}有限公司入库单
+          {{ company }}有限公司入库单
         </div>
         <div class="print_table" style="display: flex">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
@@ -2031,7 +2031,7 @@
           type="primary"
           :disabled="browseStatus"
           @click="
-            addprint();
+            addprint('bzrkd');
             print_bzrkd = false;
           "
           >打印
@@ -2045,7 +2045,7 @@
       :close-on-click-modal="false"
       :modal="false"
     >
-      <div id="print_area1" class="print-div">
+      <div id="print_area5" class="print-div">
         <div
           class="print-title"
           style="
@@ -2143,7 +2143,7 @@
           type="primary"
           :disabled="browseStatus"
           @click="
-            addprint();
+            addprint('lhd');
             print_lhd = false;
           "
           >打印
@@ -2157,7 +2157,7 @@
       :close-on-click-modal="false"
       :modal="false"
     >
-      <div id="print_area1" class="print-div">
+      <div id="print_area6" class="print-div">
         <div
           class="print-title"
           style="
@@ -2227,7 +2227,7 @@
           type="primary"
           :disabled="browseStatus"
           @click="
-            addprint();
+            addprint('hwqr');
             print_hwqr = false;
           "
           >打印
@@ -2241,7 +2241,7 @@
       :close-on-click-modal="false"
       :modal="false"
     >
-      <div id="print_area1" class="print-div">
+      <div id="print_area7" class="print-div">
         <div
           class="print-title"
           style="
@@ -2317,7 +2317,7 @@
           type="primary"
           :disabled="browseStatus"
           @click="
-            addprint();
+            addprint('lwqr');
             print_lwqr = false;
           "
           >打印
@@ -2331,7 +2331,7 @@
       :close-on-click-modal="false"
       :modal="false"
     >
-      <div id="print_area1" class="print-div">
+      <div id="print_area13" class="print-div">
         <div
           class="print-title"
           style="
@@ -2425,7 +2425,7 @@
           type="primary"
           :disabled="browseStatus"
           @click="
-            addprint();
+            addprint('dpxx');
             print_dpxx = false;
           "
           >打印
@@ -2941,7 +2941,7 @@
       :close-on-click-modal="false"
       :modal="false"
     >
-      <div id="print_area1" class="print-div">
+      <div id="print_area14" class="print-div">
         <div
           class="print-title"
           style="
@@ -3016,7 +3016,7 @@
           type="primary"
           :disabled="browseStatus"
           @click="
-            addprint();
+            addprint('dk');
             print_dk = false;
           "
           >打印
@@ -3138,7 +3138,7 @@ import upLoad from "../components/upLoad";
 import incomeMoney from "../components/incomeMoney";
 import payMoney from "../components/payMoney";
 // import downloadTemplate from "./downloadTemplate";
-import uploadExcel from "./uploadExcel";
+// import uploadExcel from "./uploadExcel";
 export default {
   name: "inStock",
   props: {
@@ -3160,7 +3160,6 @@ export default {
     upLoad,
     incomeMoney,
     payMoney,
-    uploadExcel,
   },
   data() {
     return {
@@ -5191,8 +5190,8 @@ export default {
               //   this.container = this.container.slice(0,this.container.length-1)
               //   console.log(this.container)
               //   this.print_zpdkrkd = true
-              // } else if (command == "g") {
-              //   this.print_bzrkd = true;
+            } else if (command == "z") {
+              this.print_bzrkd = true;
             } else if (command == "h") {
               this.print_dk = true;
             }
@@ -5413,6 +5412,54 @@ export default {
             scanStyles: false,
           });
           break;
+        case "shd":
+          print({
+            printable: "print_area2",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
+        case "rkd":
+          print({
+            printable: "print_area3",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
+        case "bzrkd":
+          print({
+            printable: "print_area4",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
+        case "lhd":
+          print({
+            printable: "print_area5",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
+        case "hwqr":
+          print({
+            printable: "print_area6",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
+        case "lwqr":
+          print({
+            printable: "print_area7",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
         case "ccdzrkd":
           print({
             printable: "print_area8",
@@ -5453,6 +5500,22 @@ export default {
             scanStyles: false,
           });
           break;
+        case "dpxx":
+          print({
+            printable: "print_area13",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
+        case "dk":
+          print({
+            printable: "print_area14",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
       }
     },
     cancel() {

+ 41 - 0
src/views/Warehousing/inStock/downloadTemplate.vue

@@ -0,0 +1,41 @@
+<template>
+  <el-dialog
+    title="提示"
+    :visible.sync="templateVisible"
+    width="70%"
+    :before-close="handleClose"
+    :close-on-click-modal="false"
+  >
+    <span>这是一段信息</span>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="templateVisible = false">取 消</el-button>
+      <el-button type="primary" @click="templateVisible = false"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: "inStock",
+  props: {
+    downloadTemplateVisible: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      templateVisible: false,
+    };
+  },
+  created() {},
+  methods: {},
+  watch: {
+    downloadTemplateVisible() {
+      this.templateVisible = this.downloadTemplateVisible;
+    },
+  },
+};
+</script>

+ 36 - 0
src/views/Warehousing/inStock/uploadExcel.vue

@@ -0,0 +1,36 @@
+<template>
+  <el-upload
+    class="upload-demo"
+    action="https://jsonplaceholder.typicode.com/posts/"
+    :on-preview="handlePreview"
+    :on-remove="handleRemove"
+    :before-remove="beforeRemove"
+    multiple
+  >
+    <el-button size="small" type="primary">导入Execl</el-button>
+  </el-upload>
+</template>
+
+<script>
+export default {
+  name: "inStock",
+  props: {
+    uploadExcelVisible: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      uploadVisible: false,
+    };
+  },
+  created() {},
+  methods: {},
+  watch: {
+    uploadExcelVisible() {
+      this.uploadVisible = this.uploadExcelVisible;
+    },
+  },
+};
+</script>