Merge branch 'dev' of mangpiao/mp-ui-pc into test

src/views/business/exchange/components/GoodsAdd.vue

@@ -27,7 +27,6 @@
           <el-option label="全部" value=""/>
           <el-option label="实物商品" value="1"/>
           <el-option label="卡密商品" value="2"/>
-          <el-option label="采购商品" value="3"/>
         </el-select>
         <div class="ge"></div>
         <el-button
@@ -145,7 +144,7 @@ export default {
           "&pageSize=" +
           this.pageParams.pageSize +
           "&",
-        { title: this.goodsTitle, type: this.queryParams.type, status: "on", minValue: this.queryParams.minValue?accMul(this.queryParams.minValue, 100):this.queryParams.minValue, maxValue: this.queryParams.maxValue?accMul(this.queryParams.maxValue, 100):this.queryParams.maxValue,}
+        { isExcludePurchaseGoods: true,title: this.goodsTitle, type: this.queryParams.type, status: "on", minValue: this.queryParams.minValue?accMul(this.queryParams.minValue, 100):this.queryParams.minValue, maxValue: this.queryParams.maxValue?accMul(this.queryParams.maxValue, 100):this.queryParams.maxValue,}
       ).then((res) => {
         this.goodsList = res.rows.map((item) => {
           return {

src/views/business/goods/add.vue

@@ -459,7 +459,7 @@ export default {
     },
     // 获取采购优惠券下拉列表
     getCouponList() {
-      getCouponAllList({type: 4,status: "on" }).then(response => {
+      getCouponAllList({type: 4,status: "on",isExcludePurchaseCoupon: true, }).then(response => {
         this.CouponList = response.rows || [];
       });
     },

src/views/business/marketing/components/GoodsAdd.vue

@@ -22,7 +22,14 @@
         <div style="width: 20px;text-align: center">-</div>
 <!--        <el-input v-model="maxValue" placeholder="最高价格" clearable @keyup.enter.native="pageParams.pageNum = 1;getList()" />-->
         <el-input style="width: 220px" v-model="queryParams.maxValue"  @clear="queryParams.pageNum = 1;getGoodsList()" placeholder="最高价格" clearable @keyup.enter.native="queryParams.pageNum = 1;getGoodsList()"/>
-
+      </div>
+      <div class="dialog-search">
+        <div>商品类型：</div>
+        <el-select v-model="queryParams.type" placeholder="请选择商品类型" clearable @change="queryParams.pageNum = 1;getGoodsList()">
+          <el-option label="全部" value=""/>
+          <el-option label="实物商品" value="1"/>
+          <el-option label="卡密商品" value="2"/>
+        </el-select>
         <div class="ge"></div>
         <el-button
           type="primary"
@@ -140,7 +147,7 @@ export default {
           "&pageSize=" +
           this.pageParams.pageSize +
           "&",
-        { title: this.goodsTitle,  status: "on", minValue: this.queryParams.minValue?accMul(this.queryParams.minValue, 100):this.queryParams.minValue, maxValue: this.queryParams.maxValue?accMul(this.queryParams.maxValue, 100):this.queryParams.maxValue,}
+        { isExcludePurchaseGoods: true, type: this.queryParams.type, title: this.goodsTitle,  status: "on", minValue: this.queryParams.minValue?accMul(this.queryParams.minValue, 100):this.queryParams.minValue, maxValue: this.queryParams.maxValue?accMul(this.queryParams.maxValue, 100):this.queryParams.maxValue,}
       ).then((res) => {
         this.goodsList = res.rows.map((item) => {
           return {

src/views/business/ticket/components/GoodsAdd.vue

@@ -23,6 +23,12 @@
         <el-input type="number" style="width: 220px" v-model="queryParams.maxValue" @clear="pageParams.pageNum = 1;getGoodsList()"
                   placeholder="最高价格" clearable @keyup.enter.native="pageParams.pageNum = 1;getGoodsList()"/>
         <br>
+        <div>商品类型：</div>
+        <el-select v-model="queryParams.type" placeholder="请选择商品类型" clearable @change="pageParams.pageNum = 1;getGoodsList()">
+          <el-option label="全部" value=""/>
+          <el-option label="实物商品" value="1"/>
+          <el-option label="卡密商品" value="2"/>
+        </el-select>
         <div style="margin:0 0 10px 20px">盲豆兑换数量：</div>
         <el-input type="number" style="width: 220px" v-model="queryParams.minExchange" @clear="pageParams.pageNum = 1;getGoodsList()"
                   placeholder="最低盲豆数量" clearable @keyup.enter.native="pageParams.pageNum = 1;getGoodsList()"/>
@@ -180,6 +186,8 @@ export default {
           maxExchange:this.queryParams.maxExchange,
           minCost: this.queryParams.minCost ? accMul(this.queryParams.minCost, 100) : this.queryParams.minCost,
           maxCost: this.queryParams.maxCost ? accMul(this.queryParams.maxCost, 100) : this.queryParams.maxCost,
+          isExcludePurchaseGoods: true,
+          type: this.queryParams.type,
       }
       if(this.ticket == "ticketGoods") {
         data.exchangeShow = 2