Merge remote-tracking branch 'gitee/master'

!12 代码合并
Merge pull request !12 from juanmao2009/label
2024-11-07 11:52:31 +08:00 · 2024-11-07 03:16:10 +00:00 · 2024-11-06 13:50:03 +08:00 · 2024-11-06 02:52:47 +00:00 · 2024-11-06 10:50:12 +08:00
6 changed files with 97 additions and 57 deletions
--- a/src/assets/css/index.scss
+++ b/src/assets/css/index.scss
@@ -11,12 +11,11 @@
    url('https://at.alicdn.com/t/font_1995974_ihzpmuv4lpk.svg#iconfont') format('svg');
 }

-
@font-face {
-  font-family: "iconfont";
-  src: url('https://at.alicdn.com/t/c/font_4680344_rxl7gevvsys.woff2?t=1725970465332') format('woff2'),
-    url('https://at.alicdn.com/t/c/font_4680344_rxl7gevvsys.woff?t=1725970465332') format('woff'),
-    url('https://at.alicdn.com/t/c/font_4680344_rxl7gevvsys.ttf?t=1725970465332') format('truetype');
+  font-family: 'iconfont';  /* Project id 4680344 */
+  src: url('https://at.alicdn.com/t/c/font_4680344_v54lqtndz8.woff2?t=1730871528436') format('woff2'),
+       url('https://at.alicdn.com/t/c/font_4680344_v54lqtndz8.woff?t=1730871528436') format('woff'),
+       url('https://at.alicdn.com/t/c/font_4680344_v54lqtndz8.ttf?t=1730871528436') format('truetype');
 }

 .iconfont {
@@ -577,3 +576,7 @@ img {
    cursor: pointer;
  }
 }
+
+.el-tooltip__popper {
+  max-width: 600px;
+}
--- a/src/components/LablesMember.vue
+++ b/src/components/LablesMember.vue
@@ -36,7 +36,6 @@
                  v-for="(price, i) in priceList"
                  :key="i"
                  @click="currIndex = i, getQrcode(price)">
-                  <h3>{{ price.remark }}</h3>
                  <div class="price">
                    <i>¥</i>
                    <span>{{ price.price }}</span>
@@ -45,7 +44,7 @@
                    <i>¥</i>
                    <span>{{ price.originPrice }}</span>
                  </div>
-                  <p>{{ price.coin }}条/每年</p>
+                  <p>{{ price.coin }}金币</p>
                </div>
              </div>
            </div>
@@ -388,6 +387,7 @@
            &__item {
              display: flex;
              align-items: center;
+              justify-content: center;
              flex-direction: column;
              width: 140px;
              height: 170px;
--- a/src/components/print/Print.vue
+++ b/src/components/print/Print.vue
@@ -48,12 +48,14 @@
              class="item"
              style="cursor: pointer;"
              @click="search.type = 1, search.current = 1, isShowImage = true, getConfig()">
+              <i class="iconfont">&#xe672;</i>
              <div>图片素材</div>
            </div>
            <div
              class="item"
              style="cursor: pointer;"
              @click="search.type = 0, search.current = 1, isShowImage = true, getConfig()">
+              <i class="iconfont">&#xe883;</i>
              <div>文字素材</div>
            </div>
          </div>
@@ -197,34 +199,6 @@
          </div>
        </div>
      </div>
-      <!-- <ai-table
-        :tableData="templateList"
-        :col-configs="templateColConfigs"
-        :total="templateTotal"
-        :current.sync="searchTemplate.current"
-        :size.sync="searchTemplate.size"
-        height="480"
-        @getList="getTemplateList"
-        v-loading="templateLoading">
-        <el-table-column slot="img" label="预览图" align="center">
-          <template v-slot="{ row }">
-            <el-image
-              style="width: 200px; height: 200px"
-              fit="contain"
-              :src="row.previewUrl"
-              :preview-src-list="[row.previewUrl]">
-            </el-image>
-          </template>
-        </el-table-column>
-        <el-table-column slot="options" label="操作" align="center" width="200">
-          <template v-slot="{ row }">
-            <div class="table-options">
-              <el-button type="text" @click="showTemplate(row)">模板预览</el-button>
-              <el-button type="text" @click="updateTempate(row)">使用</el-button>
-            </div>
-          </template>
-        </el-table-column>
-      </ai-table> -->
      <div class="dialog-footer" slot="footer">
        <el-button @click="isShowTemplate = false">取消</el-button>
      </div>
@@ -310,12 +284,16 @@
            height: 160
          },
          '80 * 60': {
-            width: 160,
-            height: 120
+            width: 240,
+            height: 180
          },
-          '60 * 40': {
-            width: 120,
-            height: 80
+          '70 * 50': {
+            width: 210,
+            height: 150
+          },
+          '70 * 40': {
+            width: 210,
+            height: 120
          }
        },
        paperPopVisible: false,
@@ -342,10 +320,6 @@
        isShowImage: false,
        tableData: [],
        total: 0,
-        templateColConfigs: [
-          { prop: 'name', label: '模板名称', align: 'left' },
-          { slot: 'img'}
-        ],
        templateLoading: false,
        hasMore: true
      }
@@ -438,6 +412,18 @@
            this.hiprintTemplate.update(config)
            this.hiprintTemplate.setPaper(config.panels[0].width, config.panels[0].height)

+            this.curPaper = {
+              type: 'other',
+              width: config.panels[0].width,
+              height: config.panels[0].height
+            }
+
+            this.$nextTick(() => {
+              if (this.curPaper.type === 'other') {
+                this.paperWidth = config.panels[0].width
+                this.paperHeight = config.panels[0].height
+              }
+            })
            this.dynamicFromList = JSON.parse(res.data.params)
            this.isShowTemplate = false
          }
@@ -555,6 +541,9 @@
        $('#custom-provider').empty()
        // eslint-disable-next-line no-undef
        hiprint.PrintElementTypeManager.build($('#custom-provider'), 'customProvider')
+
+        $('#custom-provider ul ul li:eq(0)').prepend('<i class="iconfont">&#xe953;</i>')
+        $('#custom-provider ul ul li:eq(1)').prepend('<i class="iconfont">&#xe6f3;</i>')
      },

      buildDesigner() {
@@ -825,6 +814,7 @@
                width: 100px;
                margin-bottom: 10px;
                margin-right: 10px;
+                padding-top: 10px;
                background-color: #eee;
                border-radius: 4px;

@@ -833,7 +823,6 @@
                }

                a {
-                  margin-top: 10px;
                  padding: 10px 0;
                }
              }
--- a/src/view/lables/Print.vue
+++ b/src/view/lables/Print.vue
@@ -21,7 +21,7 @@
      <div class="search-item__wrapper">
        <div class="left">
          <div class="search-item" v-show="addType === '1'">
-            <label>发货单：</label>
+            <label>店铺：</label>
            <el-select v-model="search.mallId" placeholder="请选择店铺" size="small">
              <el-option
                v-for="item in $store.state.mallList"
@@ -31,6 +31,8 @@
              </el-option>
            </el-select>
            <el-button style="margin-left: 10px;" size="small" :disabled="!search.mallId" :loading="isLoading" @click="searchSkuList">查询</el-button>
+
+            <p class="tips">发货单列表->待仓库发货</p>
          </div>
          <div class="search-item" v-show="addType === '2' || addType === '3'">
            <label>{{ addType === '2' ? 'SKC：' : 'SKU：' }}</label>
@@ -40,7 +42,7 @@
              style="width: 250px"
              size="small"
              clearable
-              placeholder="多个查询请用户逗号分割"
+              placeholder="多个查询请用逗号分割"
              suffix-icon="iconfont iconSearch">
            </el-input>
            <el-input
@@ -48,7 +50,7 @@
              v-model="search.productSkcId"
              style="width: 250px"
              size="small"
-              placeholder="多个查询请用户逗号分割"
+              placeholder="多个查询请用逗号分割"
              clearable
              suffix-icon="iconfont iconSearch">
            </el-input>
@@ -63,6 +65,18 @@
        :height="height"
        @getList="() => {}"
        :loading="isLoading">
+        <el-table-column slot="product" width="280px" label="商品信息" align="center">
+          <template slot-scope="scope">
+            <div class="product">
+              <img :src="scope.row.thumbUrl" v-if="scope.row.thumbUrl">
+              <div class="right">
+                <el-tooltip class="item" effect="dark" :content="scope.row.productName" placement="top">
+                  <div>{{ scope.row.productName }}</div>
+                </el-tooltip>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
        <el-table-column slot="options" label="操作" align="center" fixed="right" width="120px">
          <template v-slot="{ row }">
            <div class="table-options">
@@ -103,12 +117,15 @@
      return {
        colConfigs: [
          { prop: 'mallName', label: '店铺名称', align: 'left' },
+          // { prop: 'productName', label: '商品名称', width: '280px', align: 'center' },
+          { slot: 'product' },
          { prop: 'labelCode', label: '条码编码', align: 'center' },
          { prop: 'productSkcId', label: 'SKC', align: 'center' },
          { prop: 'productSkuId', label: 'SKU', align: 'center' },
          { prop: 'skuExtCode', label: 'SKU货号',  align: 'center' },
          { prop: 'skuSpecName', label: '次销售属性', align: 'center' },
-          { prop: 'deliveryNum', label: '发货数', align: 'center' }
+          { prop: 'deliveryNum', label: '发货数', align: 'center' },
+          { prop: 'purchaseTime', label: '创建时间', align: 'center', format: v => this.$dayjs(v).format('YYYY-MM-DD HH:mm:ss') }
        ],
        search: {
          mallId: '',
@@ -281,6 +298,7 @@
                  labelCode: v.labelCode,
                  skuExtCode: v.skuExtCode,
                  deliveryNum: v.deliveryNum,
+                  thumbUrl: v.thumbUrl,
                  skuSpecName: v.secondarySpecVOList.map(item => {
                    return item.specName
                  }).join(',')
@@ -339,5 +357,35 @@
        align-items: center;
      }
    }
+
+    .product {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      .right {
+        flex: 1;
+        margin-left: 10px;
+        text-align: left;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+
+        div {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+      }
+
+      img {
+        width: 60px;
+      }
+    }
+    .tips {
+      margin-left: 20px;
+      font-size: 14px;
+      color: red;
+    }
  }
 </style>
--- a/src/view/lables/SkuManage.vue
+++ b/src/view/lables/SkuManage.vue
@@ -142,7 +142,7 @@
              v-model="skuReqParams.SKC"
              style="width: 250px"
              size="small"
-              placeholder="多个查询请用户逗号分割"
+              placeholder="多个查询请用逗号分割"
              clearable
              @clear="getSkuList()"
              suffix-icon="iconfont iconSearch">
@@ -156,7 +156,7 @@
              v-model="skuReqParams.SKU"
              style="width: 250px"
              size="small"
-              placeholder="多个查询请用户逗号分割"
+              placeholder="多个查询请用逗号分割"
              clearable
              @clear="getSkuList()"
              suffix-icon="iconfont iconSearch">
--- a/src/view/product/BatchUpload.vue
+++ b/src/view/product/BatchUpload.vue
@@ -71,7 +71,7 @@ import { formatDate } from "@/utils/date.js"
        detailPicList: [],
        coin: 150,
        colConfigs: [
-          { slot: 'productName', label: '商品名称', width: '180px', align: 'left', fixed: 'left' },
+        { slot: 'productName', label: '商品名称', width: '180px', align: 'left', fixed: 'left' },
          { prop: 'category', label: '分类', width: '140px', align: 'left', fixed: 'left' },
          { prop: 'productId', label: 'SPU ID', width: '120px', align: 'left' },
          { prop: 'productSkcId', label: 'SKC ID', width: '120px', align: 'left' },
@@ -130,9 +130,9 @@ import { formatDate } from "@/utils/date.js"
            await this.dealAction("", res)
          }
        })
-        
-        
-      }, 
+
+
+      },
      async dealAction (root, obj) {
        console.log(obj)
        if (obj.entries) {
@@ -188,7 +188,7 @@ import { formatDate } from "@/utils/date.js"
          } else if (entry[0] == '详情图' && entry[1].kind == 'directory') {
            this.detailPicList = await this.getPictureList(root + '/' + entry[0], entry[1])
          }
-          
+
        }
        if (this.mainPicList.length >= 0 && this.detailPicList.length >= 0) {
          await this.beginAddToDraft(obj.name)
@@ -302,4 +302,4 @@ import { formatDate } from "@/utils/date.js"
      }
    }
  }
-</style>
+</style>
Author	SHA1	Message	Date
aixianling	67b8108825	Merge remote-tracking branch 'gitee/master'	2024-11-07 11:52:31 +08:00
juanmao2009	90046641c0	!12 代码合并 Merge pull request !12 from juanmao2009/label	2024-11-07 03:16:10 +00:00
yanran200830	510f3aa888	修复bug	2024-11-06 13:50:03 +08:00
juanmao2009	acbd7f6a86	!11 修改会员信息 Merge pull request !11 from juanmao2009/label	2024-11-06 02:52:47 +00:00
yanran200830	f3ad1604d8	修复金币充值bug	2024-11-06 10:50:12 +08:00