bug：导入券码位置更换

src/views/card/gic-card/card-info.vue

@@ -22,7 +22,7 @@
                 <el-color-picker :disabled="isInfo" popper-class="hide-picker" v-model="ruleForm.color" :predefine="predefineColors" />
               </div>
             </el-form-item>
-            <el-form-item label="导入券码" v-if="info.customCodeFlag === 2 && isEdit">
+            <!-- <el-form-item label="导入券码" v-if="info.customCodeFlag === 2 && isEdit">
               <el-button type="text" @click="importVisible = true">上传文件</el-button>
               <span class="gray03 cursor" v-if="fileList.length > 0">
                 <el-popover open-delay="200" placement="top-start" title="已上传列表" width="250" trigger="hover">
@@ -30,7 +30,7 @@
                   <i slot="reference" class="el-icon-document ml15"></i>
                 </el-popover>
               </span>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="兑换券优惠内容" v-if="info.cardType === 2">
               <vue-gic-goods-selector-new ref="selector4" :read-only="true" :id="info.goodsSearchId" />
             </el-form-item>
@@ -39,12 +39,21 @@
             <el-form-item label="成本费用" v-if="info.cardType !== 1">{{ info.costPrice }} 元</el-form-item>
             <el-form-item v-if="info.useConditionLimit" label="最低适用商品件数">{{ info.useConditionLimit.goods_adapt_number_min_limit ? `${info.useConditionLimit.goods_adapt_number_min_limit} 件` : '不限' }}</el-form-item>
             <el-form-item v-if="info.useConditionLimit" label="最高适用商品件数">{{ info.useConditionLimit.goods_adapt_number_max_limit ? `${info.useConditionLimit.goods_adapt_number_max_limit} 件` : '不限' }}</el-form-item>
-            <el-form-item label="code类型">{{ info.customCodeFlag === 0 ? '随机生成' : '自定义号段' }}</el-form-item>
+            <el-form-item label="code类型">{{ info.customCodeFlag === 0 ? '随机生成' : ( info.customCodeFlag === 2 ? '导入券码':'自定义号段' ) }}</el-form-item>
             <el-form-item label="code号段" v-if="info.customCodeFlag === 1">{{ info.codeBegin }}<span class="ml8 mr8">-</span>{{ info.codeEnd }}</el-form-item>
             <el-form-item v-if="info.customCodeFlag === 1">
               <div v-if="info.codePrefixFlag">固定开头: {{ info.codePrefix }}</div>
               <div v-if="info.codeSuffixFlag" class="pt20">固定结尾: {{ info.codeSuffix }}</div>
             </el-form-item>
+            <el-form-item label="导入券码" v-if="info.customCodeFlag === 2 && isEdit">
+              <el-button type="text" @click="importVisible = true">上传文件</el-button>
+              <span class="gray03 cursor" v-if="fileList.length > 0">
+                <el-popover open-delay="200" placement="top-start" title="已上传列表" width="250" trigger="hover">
+                  <ul><li v-for="(f, idx) in fileList" :key="idx" class="ellipsis"><i class="el-icon-success success-color mr5"></i>{{ f.name }}({{ f.size }}k)</li></ul>
+                  <i slot="reference" class="el-icon-document ml15"></i>
+                </el-popover>
+              </span>
+            </el-form-item>
             <el-form-item label="库存数量">{{ info.couponStock }}</el-form-item>
             <div class="common-title mb25 mt60" id="f2">领取和使用限制</div>
             <el-form-item label="领券限制">{{ info.getLimit }} 张/人</el-form-item>

src/views/card/gic-card/card-list.vue

@@ -293,7 +293,7 @@ export default {
       params.sortOrder = params.sortOrder || 'desc';
       if(params.searchType == 1) params.cardName = params.search;
       if(params.searchType == 2) params.remarkName = params.search;
-      if(params.searchType == 3) params.subTitle = params.search;
+      // if(params.searchType == 3) params.subTitle = params.search;
       if(params.searchType == 4) params.erpDemoCode = params.search;
       delete params.search;
       delete params.searchType;