howie 3 лет назад
Родитель
Сommit
343aea476c

+ 2 - 3
src/views/supply/deliver/components/design/preview.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-  class="sub-main"
+    class="sub-main"
     :visible.sync="visible"
     :show-close="false"
     :maskClosable="false"
@@ -8,7 +8,7 @@
     @cancel="hideModal"
     :width="350 + 'mm'"
   >
-    <div  :spinning="spinning" style="min-height: 100px">
+    <div v-loading="spinning" style="min-height: 100px">
       <div id="preview_content" ref="printDom"></div>
     </div>
     <template slot="title">
@@ -67,7 +67,6 @@ export default {
     },
     show(hiprintTemplate, printData, width = "210") {
       this.visible = true;
-      this.spinning = true;
       this.width = width;
       this.hiprintTemplate = hiprintTemplate;
       this.printData = printData;

+ 4 - 3
src/views/supply/engin/components/home_form.vue

@@ -1142,17 +1142,18 @@ export default {
               return;
             }
 
-          if(!this.goodsList[i].qty) {
+            if(!this.goodsList[i].qty) {
               this.$errorMsg('金额不能为0');
               return;
             }
-
-
           }
 
           let goodsList = JSON.parse(JSON.stringify(this.goodsList));
 
           goodsList.forEach(item => {
+
+
+
             delete item.rebateWallets;
             delete item.wallets;
           })

+ 1 - 1
src/views/supply/pickup/components/design/preview.vue

@@ -62,7 +62,7 @@ export default {
     },
     show(hiprintTemplate, printData, width = "210") {
       this.visible = true;
-      this.spinning = true;
+
       this.width = width;
       this.hiprintTemplate = hiprintTemplate;
       this.printData = printData;