打印标签优化和商品价格列表页缓存

src/views/ecw/order/components/PrintTag.vue

@@ -36,11 +36,11 @@
                     <p style=" padding-top: 0px; border-bottom: 0.2mm solid #333; text-align: center; line-height: 6mm; padding: 0px; padding-bottom: 2.5mm; margin: 0px; font-weight: 600; font-size: 6mm; " >
                         {{item.orderNo}}
                     </p>
-                    <p style=" padding: 0px; border-bottom: 0.2mm solid #333; text-align: center; line-height: 6mm; padding: 0px; padding-top: 2.6mm; padding-bottom: 2.6mm; margin: 0px; font-weight: 600; font-size: 4mm; " >
+                    <p style="padding:0; border-bottom: 0.2mm solid #333; text-align: center; line-height: 6mm; padding-top: 2.3mm; padding-bottom: 2.3mm; margin: 0px; font-weight: 600; font-size: 6mm; word-break: break-all; height: 10mm; overflow: hidden;box-sizing: content-box;">
                         {{item.marks}}
                     </p>
 
-                    <p style=" white-space: nowrap; padding: 0px; border-bottom: 0.2mm solid #333; text-align: center; line-height: 6mm; padding: 0px; margin: 0px; font-size: 5mm; text-transform: uppercase; padding-top: 3.5mm; padding-bottom: 2.5mm; " >
+                    <p style=" white-space: nowrap; padding: 0px; border-bottom: 0.2mm solid #333; text-align: center; line-height: 6mm; padding: 0px; margin: 0px; font-size: 5mm; text-transform: uppercase; padding-top: 3.5mm; padding-bottom: 2.5mm;">
                         {{item.startTitleEn}} --&gt;
                         <label style="font-weight: 600; font-size: 5.5mm">{{item.destTitleEn}} </label>
                     </p>
@@ -142,7 +142,7 @@ export default {
 
                 LODOP.SET_PRINT_PAGESIZE(0, 800, 600, "TAG");
                 for(let i in items){
-                    LODOP.ADD_PRINT_HTM("5mm",0,800,600, items[i].innerHTML);
+                    LODOP.ADD_PRINT_HTM("2mm",0,800,600, items[i].innerHTML);
                     if(i < items.length){
                         LODOP.NewPage()
                     }

src/views/ecw/product/index.vue

@@ -215,7 +215,7 @@ import { CommonStatusEnum, AuditStatusEnum } from '@/utils/constants';
 import { uploadFile } from "@/api/infra/file";
 import ImageUpload from '@/components/ImageUpload'
 export default {
-  name: "ProductList",
+  name: "EcwProductIndex",
   components: {
     ImageUpload
   },

src/views/ecw/productPrice/edit.vue

@@ -423,8 +423,8 @@ export default {
       }
     },
     'form.priceType'(priceType){
-      // 切换全包价的时候给默认货币单位
-      if(priceType == 1){
+      // 切换全包价的时候给默认货币单位，如果是回填则不需要给默认值
+      if(priceType == 1 && !this.form.allPrice){
         this.$set(this.form, 'allPriceUnit', 1)
       }
       this.syncAllUnit()

src/views/ecw/productPrice/index.vue

@@ -251,7 +251,7 @@ import {arrryToKeyedObjectBy} from '@/utils/index'
 import { getProduct } from '@/api/ecw/product';
 import {parseTime} from '@/utils/ruoyi'
 export default {
-  name: "ProductPrice",
+  name: "EcwProductpriceIndex",
   filters: {parseTime},
   components: {
     DictTag
@@ -436,10 +436,9 @@ export default {
       return this.cityList.filter(item => item.type == 1 || item.type == 3)
     },
   },
-
   activated() {
-    /* console.log('activated', this.product.id)
-    this.$set(this.queryParams, 'typeId', +this.$route.query.product_type || null)
+    console.log('activated', Object.assign({}, this.$route.query))
+    /* this.$set(this.queryParams, 'typeId', +this.$route.query.product_type || null)
 
     let productId = this.product?.id
     console.log(this.$route.query.product_id, productId, this.$route.query.product_id != productId)
@@ -449,7 +448,9 @@ export default {
         pageSize: 10
       }
     }
-    this.handleQuery() */
+    this.handleQuery()
+     */
+     this.getList();
   },
   watch:{
     '$route.query.product_id'(){