fix: 卡券新建

src/api/common.js

@@ -19,11 +19,11 @@ let o2 = {
     method: 'post',
     useFormData: true,
   },
+  getRelationId: '/gift/get-gift-id', // 随机返回一个ID
 };
 
 // other
 let other = {
-  getRelationId: '/notice-widget/generate-relation-id', // 获取relation临时id
   getAppInfo: {
     url: '/enterprise-serve-info', // 根据appCode获取应用信息
     alertError: false,

src/utils/request.js

@@ -29,7 +29,6 @@ import { SUCCESS_CODE, origin } from '@/config';
  * @param {*} code ui目前只处理如下code
  */
 function handlerErr(code) {
-  return;
   if (process.env['NODE_ENV'] === 'development') { // eslint-disable-line
     return;
   }

src/views/gic-card/card-form.js

@@ -8,7 +8,7 @@ import resultDialog from './module/result-dialog';
 import sendPreview from './module/send-preview';
 import importCode from './module/import-code';
 import commomApi from '@/api/common.js';
-const { uploadUrl } = commomApi;
+const { uploadUrl, getRelationId } = commomApi;
 const { addCard, copyCard, checkDemoCode, getMallShopList } = api;
 
 // 禁止回车
@@ -384,6 +384,7 @@ export default {
   },
   mounted() {
     if (this.currentAreaId) {
+      this.getRelationId(); // 生成主键
       this.getMallShopList();
       // this.handleGetSubAppByInfo();
       if (this.isCopy) {
@@ -392,6 +393,11 @@ export default {
     }
   },
   methods: {
+    getRelationId() {
+      getRelationId().then(res => {
+        this.couponId = res.result;
+      });
+    },
     getMallShopList() {
       getMallShopList().then(res => {
         this.gicMallShopList = res.result || [];
@@ -708,6 +714,7 @@ export default {
       }
       let params = { ...this.ruleForm1, ...this.ruleForm2, ...this.ruleForm3, goodsSearchId: this.goodsSearchId };
       try {
+        params.couponId = this.couponId; // 主键在一进来页面的时候就已经确定
         params.memberCardId = this.currentAreaId;
         // 处理数据
         params.getLimit = params.cardLimitRadio === 0 ? params.getLimit : params.cardLimitRadio;

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

@@ -84,8 +84,7 @@
             </el-tooltip>
           </el-radio>
           <el-radio v-model="ruleForm1.customCodeFlag" :label="1">自定义号段</el-radio>
-          <!-- 20210203 后端 暂时隐藏 TODO: -->
-          <!-- <el-radio v-model="ruleForm1.customCodeFlag" :label="2" @change="(v) => { if(v == 2) { importVisible = true } }">
+          <el-radio v-model="ruleForm1.customCodeFlag" :label="2" @change="(v) => { if(v == 2) { importVisible = true } }">
             <span @click="ruleForm1.customCodeFlag = 2;importVisible = true">导入券码</span>
             <span class="gray03 cursor" v-if="fileList.length > 0">
               <el-popover placement="top-start" title="已上传列表" width="250" trigger="hover">
@@ -93,7 +92,7 @@
                 <i slot="reference" class="el-icon-document ml5"></i>
               </el-popover>
             </span>
-          </el-radio> -->
+          </el-radio>
         </el-form-item>
         <el-form-item prop="customCode" label="code号段" key="customCode" v-if="ruleForm1.customCodeFlag === 1">
           <!--  @blur="checkInputNumber(ruleForm1.codeBegin, 'codeBegin')" -->