提交数据

src/components/LeaderManagement/leaderReimbursement.vue

@@ -653,7 +653,7 @@
         if (str == '2')
           return '儿童'
         if (str == '3')
-          return '婴儿'
+          return '小人'
       },
       UseDinnerTypeToWord(str) {
         if (str == 1)

src/components/activity/CommodityType.vue

@@ -199,8 +199,6 @@ export default {
       outerVisible: false,
       dialogTitle: "",
       dataList: [],
-      awardRelationList: [],
-      jurisdictionsList: []
     };
   },
   mounted() {
@@ -268,6 +266,7 @@ export default {
         this.$forceUpdate();
       });
     },
+    
     //获取数据
     getList() {
       this.loading = true;
@@ -300,7 +299,7 @@ export default {
     },
     //提交添加
     addAward() {
-      if (this.addMsg.icon === "") return this.Error("请上传icon");
+      if (this.addMsg.icon === "") return this.Error("请上传图片");
       this.apiJavaPost(
         "/api/IntegralManager/goodsTypeManager",
         this.addMsg,

src/components/activity/IntegralMall.vue

@@ -35,10 +35,10 @@
         </li>
         <li>
           <span>
-            <em>热门商品</em>
+            <em>商品活动</em>
             <el-select filterable v-model="msg.ishot">
-              <el-option label="热门" value="Y"></el-option>
-              <el-option label="非热门" value="N"></el-option>
+              <el-option label="不限" value=""></el-option>
+              <el-option v-for="item in GoodsSeriesList" :label="item.name" :value="item.id" :key="item.id"></el-option>
             </el-select>
           </span>
         </li>
@@ -59,7 +59,7 @@
         <th>市场价</th>
         <th>限购数</th>
         <th>配送说明</th>
-        <th>是否热门</th>
+        <th>所属活动</th>
         <th>商品状态</th>
         <th>操作</th>
       </tr>
@@ -71,7 +71,7 @@
          <td>{{item.marketPrice}}</td>
          <td>{{item.quota === 0 ? '不限购' : `限购${item.quota}次`}}</td>
          <td>{{item.logistic}}</td>
-         <td>{{item.ishot === 'Y' ? '热门' : '非热门'}}</td>
+         <td>{{getHotName(item.ishot)}}</td>
          <td>{{item.state === 1 ? '上架' : item.state === 0 ? '下架' : '删除'}}</td>
          <td>
             <el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
@@ -102,21 +102,47 @@ export default {
         state: 1,
         name: '',
         type: '',
-        ishot: 'Y'
+        ishot: ''
       },
       loading:false,
       dataList:[],
       GoodsTypeList: [],
+      GoodsSeriesList: [],
     };
   },
   mounted() {
     this.getList();
     this.getGoodsTypeManager(); 
+    this.getGoodsSeries();
   },
   filters: {
   },
 
   methods: {
+    getHotName: function (id) {
+      for(let i = 0; i < this.GoodsSeriesList.length; i++ ) {
+        if (this.GoodsSeriesList[i].id === id) {
+          return this.GoodsSeriesList[i].name
+        }
+      }
+      return '无'
+    },
+    getGoodsSeries() {
+      this.loading = true;
+      this.apiJavaPost(
+        "/api/IntegralManager/getGoodsSeries",
+        {},
+        res => {
+          this.loading = false;
+          if (res.data.resultCode === 1) {
+            this.GoodsSeriesList = res.data.data;
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        null
+      );
+    },
     addIntegralMall: function( path, obj, tab){
       localStorage.editIntegralMall = JSON.stringify(obj);
       this.$router.push({ name: path,query:{blank: 'y', tab: tab} })

src/components/activity/addIntegralMall.vue

@@ -250,10 +250,10 @@
         <el-form-item label="包装说明">
           <el-input v-model="addMsg.packing" class="w217"/>
         </el-form-item>
-        <el-form-item label="是否热门">
+        <el-form-item label="商品所属活动">
           <el-select filterable v-model="addMsg.ishot">
-            <el-option label="热门" value="Y" :key="1"></el-option>
-            <el-option label="非热门" value="N" :key="0"></el-option>
+            <el-option label="无" :value="0" :key="0"></el-option>
+            <el-option v-for="item in GoodsSeriesList" :label="item.name" :value="item.id" :key="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="配送说明">
@@ -408,7 +408,7 @@ export default {
         logistic: "",
         state: 1,
         quota: 0,
-        ishot: "Y",
+        ishot: 0,
         descripImg: '',
       },
       MenberList: [],
@@ -442,10 +442,27 @@ export default {
       },
       images: [],
       defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
-      apiUrl: 'addGoodsInfo'
+      apiUrl: 'addGoodsInfo',
+      GoodsSeriesList: [],
     };
   },
   methods: {
+    getGoodsSeries() {
+      this.loading = true;
+      this.apiJavaPost(
+        "/api/IntegralManager/getGoodsSeries",
+        {},
+        res => {
+          this.loading = false;
+          if (res.data.resultCode === 1) {
+            this.GoodsSeriesList = res.data.data;
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        null
+      );
+    },
     goIntegralMall: function(path) {
       this.$router.push({ name: path });
     },
@@ -608,6 +625,7 @@ export default {
     }
     this.getMenberList();
     this.getGoodsTypeManager();
+    this.getGoodsSeries();
   }
 };
 </script>

src/components/administrative/ExaminationStatistics.vue

@@ -505,11 +505,17 @@ export default {
         value: `2019${o}`,
       })
     }
-    this.msg.Periods=dt.getFullYear()+(dt.getMonth()>9?dt.getMonth():"0"+dt.getMonth())
+    // this.msg.Periods=dt.getFullYear()+(dt.getMonth()>9?dt.getMonth():"0"+dt.getMonth())
     this.getList();
     this.getCompanyList();
   },
   created(){
+    let date=new Date;
+    let year=date.getFullYear(); 
+    let month=date.getMonth()+1;
+    month =(month<10 ? "0"+month:month); 
+    let mydate = (year.toString()+month.toString());
+    this.msg.Periods = mydate;
       Vue.component('commission-table-operation',{
       template:`<div style='width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;'><el-button type="primary" size='mini' icon="el-icon-view" circle @click="see(rowData,index)"></el-button></div>`,
       props:{

src/router/config.js

@@ -3345,7 +3345,7 @@ export default {
                             meta: {
                                 title: '商品类型'
                             }
-                        },                       
+                        },
                         {
                             path: '/IntegralMall',
                             name: 'IntegralMall',
@@ -3362,6 +3362,14 @@ export default {
                                 title: '新增商品'
                             }
                         },
+                        {
+                            path: '/CommodityActive',
+                            name: 'CommodityActive',
+                            component: resolve => require(['@/components/activity/CommodityActive'], resolve),
+                            meta: {
+                                title: '商品活动'
+                            }
+                        },
                     ]
                 },
                 {