Merge branch 'feature/1511-goods-type-filter' into dev

# Conflicts:
#	backendEle/src/views/shop/goods-add.vue
#	backendEle/src/views/shop/index.vue

backendEle/src/views/shop/goods-add.vue

@@ -5,12 +5,12 @@
         <el-form-item label="商品名称">
           <el-input v-model="form.goodsName"></el-input>
         </el-form-item>
-        <!-- <el-form-item label="商品来源">
-            <el-select v-model="form.type" placeholder="请选择商品来源">
-                <el-option v-for="(item,index) in goodsType" :key="index" :label="item.name"
-                           :value="index"></el-option>
-            </el-select>
-        </el-form-item> -->
+      <!-- <el-form-item label="商品来源">
+          <el-select v-model="form.type" placeholder="请选择商品来源">
+              <el-option v-for="(item,index) in goodsType" :key="index" :label="item.name"
+                         :value="index"></el-option>
+          </el-select>
+      </el-form-item> -->
         <el-form-item label="会员折扣">
           <el-input v-model="form.sellDiscount"></el-input>
         </el-form-item>
@@ -22,68 +22,69 @@
         </el-form-item>
         <el-form-item label="报单类型">
           <el-radio-group v-model="form.reconsumeType">
-            <el-radio v-for="(value,index) in GiftTypeArr" :label="index" :key="index" v-show="(index-1)%2==0" @click.native.prevent="reconsumeChange(index)">{{value.name}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <!-- <el-form-item label="复消购买方式">
-            <el-checkbox  v-for="(value,key) in sellType" v-model="form.sellType[key-1]" :key="key" >{{value.name}}</el-checkbox>
-        </el-form-item> -->
-        <el-form-item label="PV分期">
-          <!-- <el-checkbox v-model="form.pvSplit"></el-checkbox> -->
-          <el-select v-model="form.pvSplit" placeholder="">
-            <el-option
-              v-for="item in pvSplitOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="商品编号">
-            <el-input v-model="form.goodsNo"></el-input>
-        </el-form-item>
-        <el-form-item label="单位">
-            <el-input v-model="form.unit"></el-input>
-        </el-form-item>
-        <el-form-item label="市场价格">
-            <el-input v-model="form.marketPrice"></el-input>
-        </el-form-item>
-        <el-form-item label="销售价格">
-            <el-input v-model="form.sellPrice"></el-input>
-        </el-form-item>
-        <el-form-item label="价格PV	">
-            <el-input v-model="form.pricePv"></el-input>
-        </el-form-item>
-        <!-- <el-form-item label="兑换积分">
-            <el-input v-model="form.point"></el-input>
-        </el-form-item> -->
-        <el-form-item label="库存">
-            <el-input v-model="form.storeNums"></el-input>
-        </el-form-item>
-        <el-form-item label="商品详情">
-          <el-input
-                  type="textarea"
-                  :rows="2"
-                  placeholder="请输入内容"
-                  v-model="form.content">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="排序">
-            <el-input v-model="form.sort"></el-input>
-        </el-form-item>
-        <el-form-item label="上传图片">
-            <div class='up_load'>
-                <leo-uploader
-                    @on-success='upLoadSuccess'
-                    :request-route="'shop/upload'"
-                ></leo-uploader>
-            </div>
-        </el-form-item>
-        <el-form-item>
-            <el-button type="primary" @click="addSubmit" :loading="submitButtonStat">添加</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
+              <el-radio v-for="(value,index) in GiftTypeArr" :label="index" :key="index" v-show="(index-1)%2==0">{{value.name}}</el-radio>
+              <el-radio :label="null">无</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <!-- <el-form-item label="复消购买方式">
+              <el-checkbox  v-for="(value,key) in sellType" v-model="form.sellType[key-1]" :key="key" >{{value.name}}</el-checkbox>
+          </el-form-item> -->
+          <el-form-item label="PV分期">
+<!--                    <el-checkbox v-model="form.pvSplit"></el-checkbox>-->
+            <el-select v-model="form.pvSplit" placeholder="">
+              <el-option
+                v-for="item in pvSplitOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="商品编号">
+              <el-input v-model="form.goodsNo"></el-input>
+          </el-form-item>
+          <el-form-item label="单位">
+              <el-input v-model="form.unit"></el-input>
+          </el-form-item>
+          <el-form-item label="市场价格">
+              <el-input v-model="form.marketPrice"></el-input>
+          </el-form-item>
+          <el-form-item label="销售价格">
+              <el-input v-model="form.sellPrice"></el-input>
+          </el-form-item>
+          <el-form-item label="价格PV	">
+              <el-input v-model="form.pricePv"></el-input>
+          </el-form-item>
+          <!-- <el-form-item label="兑换积分">
+              <el-input v-model="form.point"></el-input>
+          </el-form-item> -->
+          <el-form-item label="库存">
+              <el-input v-model="form.storeNums"></el-input>
+          </el-form-item>
+          <el-form-item label="商品详情">
+            <el-input
+                    type="textarea"
+                    :rows="2"
+                    placeholder="请输入内容"
+                    v-model="form.content">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="排序">
+              <el-input v-model="form.sort"></el-input>
+          </el-form-item>
+          <el-form-item label="上传图片">
+              <div class='up_load'>
+                  <leo-uploader
+                      @on-success='upLoadSuccess'
+                      :request-route="'shop/upload'"
+                  ></leo-uploader>
+              </div>
+          </el-form-item>
+          <el-form-item>
+              <el-button type="primary" @click="addSubmit" :loading="submitButtonStat">添加</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
   </div>
 </template>
 
@@ -100,7 +101,7 @@ export default {
     this.getData()
     this.getFileToken()
   },
-  data () {
+  data(){
     return {
       dialogImageUrl: '',
       dialogVisible: false,
@@ -136,7 +137,7 @@ export default {
         cover: '',
         textarea: '',
         sellDiscount: '',
-        reconsumeType: ''
+        reconsumeType: null
       },
       submitButtonStat: false,
       goodsType: [],
@@ -152,13 +153,6 @@ export default {
     }
   },
   methods: {
-    reconsumeChange (key) {
-      if (this.form.reconsumeType !== key) {
-        this.form.reconsumeType = key
-      } else {
-        this.form.reconsumeType = null
-      }
-    },
     handleRemove (file) {
       console.log(file)
     },
@@ -224,8 +218,8 @@ export default {
           sen_gift.push((index + 1).toString())
         }
       })
-      if (this.form.reconsumeType) { // 复消类型，单选
-        sen_gift.push((this.form.reconsumeType).toString())
+      if (this.form.reconsumeType == 0 || this.form.reconsumeType == 2) { // 复消类型，单选
+        sen_gift.push((this.form.reconsumeType + 1).toString())
       }
 
       let postData = {
@@ -235,6 +229,7 @@ export default {
         type: this.form.type,
         giftType: sen_gift,
         sellType: sellType,
+        pvSplit: this.form.pvSplit,
         goodsNo: this.form.goodsNo,
         unit: this.form.unit,
         marketPrice: this.form.marketPrice,

backendEle/src/views/shop/index.vue

@@ -84,7 +84,8 @@
                     </el-form-item>
                     <el-form-item label="报单类型">
                       <el-radio-group v-model="form.reconsumeType">
-                        <el-radio v-for="(value,index) in GiftTypeArr" :label="index" :key="index" v-show="(index%2)==0" @click.native.prevent="reconsumeChange(index)">{{value.name}}</el-radio>
+                        <el-radio v-for="(value,index) in GiftTypeArr" :label="index" :key="index" v-show="(index%2)==0">{{value.name}}</el-radio>
+                        <el-radio :label="null">无</el-radio>
                       </el-radio-group>
                     </el-form-item>
                     <!-- <el-form-item label="复消购买方式">
@@ -262,11 +263,11 @@ export default {
         cover: '',
         textarea: '',
         sellDiscount: '',
-                    pvSplit:'',
+        pvSplit: '',
         statusdate: '',
         goodsstatusdate: '',
         goodsdate: '',
-        reconsumeType: ''
+        reconsumeType: null
       },
       submitButtonStat: false,
       goodsType: [],
@@ -276,13 +277,6 @@ export default {
     }
   },
   methods: {
-    reconsumeChange (key) {
-      if(this.form.reconsumeType!=key){
-        this.form.reconsumeType = key
-      }else{
-        this.form.reconsumeType = null
-      }
-    },
     handleSelectionChange (val) {
       this.multipleSelection = val
     },
@@ -331,9 +325,9 @@ export default {
               }
             })
           }
-          for (let j in gift){
-            if(gift[j]%2!=0){
-              vueObj.form.reconsumeType = gift[j]-1
+          for (let j in gift) {
+            if (gift[j] % 2 != 0) {
+              vueObj.form.reconsumeType = gift[j] - 1
             }
           }
         }
@@ -468,13 +462,12 @@ export default {
 
       let sen_gift = []
       this.GiftTypeArr.map((item, index) => {
-        if (item.checked && (index % 2!=0)) {
+        if (item.checked && (index % 2 != 0)) {
           sen_gift.push(item.key)
         }
       })
-      
-      if (this.form.reconsumeType==0||this.form.reconsumeType==2){ // 复消类型，单选
-        sen_gift.push((this.form.reconsumeType+1).toString())
+      if (this.form.reconsumeType == 0 || this.form.reconsumeType == 2){ // 复消类型，单选
+        sen_gift.push((this.form.reconsumeType + 1).toString())
       }
       this.form.giftType = sen_gift
       this.form.cover = this.form.coverOrigin