Procházet zdrojové kódy

查看卡密,卡号为空时显示

lsx před 2 roky
rodič
revize
f3cea9ae44

+ 6 - 2
src/components/Camilo/index.vue

@@ -2,8 +2,12 @@
   <div>
     <el-dialog title="查看卡密" :visible.sync="camiloShow" :before-close="close">
       <el-table :data="camiloData">
-        <el-table-column property="cardNo" label="卡号" min-width="250"></el-table-column>
-        <el-table-column property="cardPwd" label="密码(激活码)" min-width="250"></el-table-column>
+        <el-table-column property="cardNo" label="卡号" min-width="250" align="center">
+          <template slot-scope="{row}">
+            {{ row.cardNo?row.cardNo:'--' }}
+          </template>
+        </el-table-column>
+        <el-table-column property="cardPwd" label="密码(激活码)" min-width="250" align="center"></el-table-column>
       </el-table>
       <pagination :total="total" :page.sync="pageParams.pageNum" :limit.sync="pageParams.pageSize"
                   @pagination="getList()"/>

+ 5 - 1
src/views/business/goods/index.vue

@@ -198,7 +198,11 @@
     <camilo v-if="camiloShow" @cancel="cancel" :camiloShow="camiloShow" :camiloGoodsId="camiloGoodsId"></camilo>
     <!--    导入卡密-->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body :before-close="openSwitch">
-      <a style="color: #1890FF;" @click="downloadExcel">下载Excel模版</a>
+      1.请下载Excel模版,填写卡密
+      <br><br>
+      &emsp;&emsp;<a style="color: #1890FF;" @click="downloadExcel">下载Excel模版</a>
+      <br><br>
+      2.上传填写好卡密的Excel
       <div style="padding-top: 20px; text-align: center">
         <el-upload
           ref="upload"