update: 礼品管理

src/api/gift.js

@@ -28,7 +28,7 @@ let realGift = {
   giftStockRecord: '/gift/stock-record', // 库存记录
   giftStockLog: '/gift/stock-record-log', // 库存操作记录
   giftActivity: '/gift/activity-statistics', // 活动统计
-  giftTemplateDownload: '/gift/template-download', // 下载模板
+  giftTemplateDownload: '/gift/vir-gift-template-download', // 下载虚拟礼品模板
   giftTemplateUpload: '/gift/template-upload', // 上传模板
   giftBatchUpdate: {
     // 礼品批量操作

src/views/gift-manage/module/check-upload-detail.vue

@@ -4,7 +4,7 @@
       <div>
         <el-input placeholder="请输入关键词搜索" prefix-icon="el-icon-search" v-model="search" class="mr10 w220" clearable @keyup.enter.native="getSearchList" @clear="getSearchList"></el-input>
       </div>
-      <el-table :data="tableData">
+      <el-table :data="tableData" class="mt20">
         <el-table-column label="卡号" prop="paramOne"></el-table-column>
         <el-table-column label="卡密/券码" prop="paramTwo"></el-table-column>
         <el-table-column label="当前状态" prop="statusFlag">

src/views/gift-manage/real-gift-detail.vue

@@ -176,13 +176,19 @@
           </el-form-item>
           <el-form-item label="库存消耗方式" prop="checkList">
             <template>
-              <el-tooltip class="tips-content" effect="dark" open-delay="200" popper-class="store-tips" placement="top-start">
-                <div slot="content">固定库存：通过占用的方式获得固定可用库存，不会被其他应用/活动所消耗。<br/>实时库存：不占用库存，使用福利中心“可占库存”，与其他应用使用同个库存。</div>
-                <i class="el-icon-question" style="color:#1890ff"></i>
-              </el-tooltip>
-              <el-checkbox-group v-model="goodsForm.checkList" class="ml20" @change="changeStockUse">
-                <el-checkbox label="0">固定库存</el-checkbox>
-                <el-checkbox label="1">实时库存</el-checkbox>
+              <el-checkbox-group v-model="goodsForm.checkList" @change="changeStockUse" :disabled="isEdit">
+                <el-checkbox label="0">
+                  <el-tooltip class="tips-content" effect="dark" open-delay="200" popper-class="store-tips" placement="top-start">
+                    <div slot="content">固定库存：通过占用的方式获得固定可用库存，不会被其他应用/活动所消耗。</div>
+                    <span class="inline-block ml30 dash-style">固定库存</span>
+                  </el-tooltip>
+                </el-checkbox>
+                <el-checkbox label="1" style="margin-left:50px">
+                  <el-tooltip class="tips-content" effect="dark" open-delay="200" popper-class="store-tips" placement="top-start">
+                    <div slot="content">实时库存：不占用库存，使用福利中心“可占库存”，与其他应用使用同个库存。</div>
+                    <span class="inline-block ml30 dash-style">实时库存</span>
+                  </el-tooltip>
+                </el-checkbox>
               </el-checkbox-group>
             </template>
           </el-form-item>
@@ -191,11 +197,11 @@
           <h3>售后服务</h3>
           <el-form-item prop="refundFlag" label="支持申请退货" required>
             <template>
-              <el-tooltip class="tips-content" effect="dark" open-delay="200" popper-class="store-tips" content="若商品不支持退货，则该礼品出库后不支持生成退货单" placement="top-start">
-                <i class="el-icon-question" style="color:#1890ff"></i>
-              </el-tooltip>
-              <el-radio class="ml20" v-model="goodsForm.refundFlag" :label="1">是</el-radio>
-              <el-radio v-model="goodsForm.refundFlag" :label="0">否</el-radio>
+              <div>
+                <el-radio v-model="goodsForm.refundFlag" :label="1">是</el-radio>
+                <el-radio v-model="goodsForm.refundFlag" :label="0">否</el-radio>
+              </div>
+              <span class="tip-warm" style="display:block">若商品不支持退货，则该礼品出库后不支持生成退货单</span>
             </template>
           </el-form-item>
         </div>
@@ -223,7 +229,7 @@ import { request } from '../../utils/request';
 import { deepClone } from '../../utils/index';
 import api from '@/api/gift.js';
 import uploadUrl from '@/api/common.js';
-const { giftStandardList, giftStandardNew, giftStandardValueList, giftStandardValueNew, giftGet, giftUpdate, giftSave } = api;
+const { giftStandardList, giftStandardNew, giftStandardValueList, giftStandardValueNew, giftGet, giftUpdate, giftSave, getGiftId } = api;
 // const { giftStandardList, giftStandardNew, giftStandardValueList, giftStandardValueNew, giftGet } = api;
 export default {
   components: {
@@ -402,11 +408,24 @@ export default {
       this.bread[2].breadName = '编辑礼品';
       this.getMess();
       this.isEdit = true;
+    }else{
+      this.getGiftId();
     }
     // this.getOpenStorePick();
     this.getStandardList(); // 获取规格列表
   },
   methods: {
+    getGiftId(){
+      // let giftId;
+      getGiftId().then(res =>{
+        if(res.code === '0000'){
+          this.giftId = res.result;
+          console.log(res.result);
+        }else{
+          this.$message.error(res.message);
+        }
+      });
+    },
     // 表头添加必填标识符
     starAdd(obj){
       if(obj.column.label === '库存' || obj.column.label === '成本价(元)') {
@@ -1222,6 +1241,9 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.dash-style{
+  border-bottom: 1px dashed #2f54eb;
+}
 .w-630 {
   width: 630px;
 }
@@ -1248,34 +1270,22 @@ export default {
         color: #303133;
         font-size: 14px;
         font-weight: 700;
-        margin-bottom: 20px;
+        margin-bottom: 31px;
         margin-left: 20px;
-        padding-bottom: 20px;
+        padding-bottom: 9px;
         border-bottom: 1px solid #dfdfdf;
       }
-      // .add-btn {
-      //   height: 30px;
-      //   line-height: 30px;
-      //   border: 1px dashed #c4c6cf;
-      //   cursor: pointer;
-      //   border-radius: 2px;
-      //   color: #606266;
-      //   text-align: center;
-      //   font-size: 14px;
-      //   &:hover {
-      //     border-color: #2f54eb;
-      //     color: #2f54eb;
-      //   }
-      // }
-      .prefix-money {
-        color: #303133;
-      }
-      .add-time {
-        color: #606266;
-        margin-left: 150px;
-        &:hover {
-          color: #2f54eb;
-        }
+      h3::before{
+        clear: both;
+        content: "";
+        display: inline-block;
+        // height: 0;
+        overflow: hidden;
+        width: 3px;
+        height: 12px;
+        line-height: 14px;
+        margin-right: 8px;
+        background: #2F54EB;
       }
       .tip-warm {
         color: #909399;

src/views/gift-manage/real-gift.vue

@@ -159,7 +159,7 @@ import updateName from './module/update-name.vue';
 // import updateStock from './module/update-stock.vue';
 import updateMultiStock from './module/update-multi-stock.vue';
 import api from '@/api/gift.js';
-const { giftPage, batchUpdate, getGiftId } = api;
+const { giftPage, batchUpdate } = api;
 export default {
   components: {
     // UpdateCost,
@@ -471,16 +471,7 @@ export default {
     },
     add() {
       console.log('新建礼品,跳转');
-      let giftId;
-      getGiftId().then(res =>{
-        if(res.code === '0000'){
-          giftId = res.result;
-          this.$router.push({ path: '/gift-manage/real-gift-detail', query: { giftId: giftId } });
-          console.log(res.result);
-        }else{
-          this.$message.error(res.message);
-        }
-      });
+      this.$router.push({ path: '/gift-manage/real-gift-detail', query: { giftId: '' } });
     },
     edit(item) {
     //   console.log('编辑实物礼品', item);