Merge branch 'test' into 'master'

Test

See merge request quanshu/mp-ui-pc!305

src/views/business/goods/index.vue

@@ -154,7 +154,7 @@ export default {
       IMG_URL: publicFileGetUrl,
       loading: false,
       showSearch: true,
-      queryParams: {pageNum: 1, pageSize: 20, orderByColumn: '', isAsc: '',},
+      queryParams: {pageNum: 1, pageSize: 10, orderByColumn: '', isAsc: '',},
       tableData: [],
       total: 0,
       goodsCategoryItemsList: [],
@@ -248,7 +248,7 @@ export default {
 
     // 重置
     resetQuery() {
-      this.queryParams = { pageNum: 1, pageSize: 20, orderByColumn: '', isAsc: '',}
+      this.queryParams = { pageNum: 1, pageSize: 10, orderByColumn: '', isAsc: '',}
       this.getList();
     },
 

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

@@ -28,6 +28,7 @@
       <el-table
         v-loading="loading"
         :data="couponList"
+        row-key="couponId"
         @selection-change="handleSelectionCoupon"
         class="el-table"
       >
@@ -36,6 +37,7 @@
           width="55"
           align="center"
           fixed="left"
+          :reserve-selection="true"
         />
         <!--  -->
         <el-table-column label="券ID" prop="couponId" />

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

@@ -28,6 +28,7 @@
       <el-table
         v-loading="loading"
         :data="couponList"
+        row-key="id"
         @selection-change="handleSelectionCouponPkg"
         class="el-table"
       >
@@ -36,6 +37,7 @@
           width="55"
           align="center"
           fixed="left"
+          :reserve-selection="true"
         />
         <el-table-column label="券包编号" prop="id" />
         <el-table-column label="券包名称" prop="title" min-width="85" />

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

@@ -35,6 +35,7 @@
       <el-table
         v-loading="loading"
         :data="goodsList"
+        row-key="goodsId"
         @selection-change="handleSelectionGoods"
         class="el-table"
       >
@@ -43,6 +44,7 @@
           width="55"
           align="center"
           fixed="left"
+          :reserve-selection="true"
         />
         <el-table-column label="商品ID" prop="goodsId" />
         <el-table-column label="商品图片">

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

@@ -28,6 +28,7 @@
       <el-table
         v-loading="loading"
         :data="couponList"
+        row-key="couponId"
         @selection-change="handleSelectionCoupon"
         class="el-table"
       >
@@ -36,6 +37,7 @@
           width="55"
           align="center"
           fixed="left"
+          :reserve-selection="true"
         />
         <!--  -->
         <el-table-column label="券ID" prop="couponId" />

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

@@ -28,6 +28,7 @@
       <el-table
         v-loading="loading"
         :data="couponList"
+        row-key="id"
         @selection-change="handleSelectionCouponPkg"
         class="el-table"
       >
@@ -36,6 +37,7 @@
           width="55"
           align="center"
           fixed="left"
+          :reserve-selection="true"
         />
         <el-table-column label="券包编号" prop="id" />
         <el-table-column label="券包名称" prop="title" min-width="85" />

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

@@ -51,6 +51,7 @@
       <el-table
         v-loading="loading"
         :data="goodsList"
+        row-key="goodsId"
         @selection-change="handleSelectionGoods"
         class="el-table"
       >
@@ -59,6 +60,7 @@
           width="55"
           align="center"
           fixed="left"
+          :reserve-selection="true"
         />
         <el-table-column label="商品ID" prop="goodsId"/>
         <el-table-column label="商品图片">

src/views/business/ticket/create.vue

@@ -49,6 +49,19 @@
               <template slot="append">元</template>
             </el-input>
           </el-form-item>
+          <el-form-item label="预付售票价" prop="prePrice">
+            <el-input
+              v-model="form.prePrice"
+              style="width: 240px"
+              size="small"
+              placeholder="请输入预付售票价"
+            >
+              <template slot="append">元 / 张</template>
+            </el-input>
+          </el-form-item>
+          <div class="tip" v-if="form.type != 'offline'">
+            如果为0则不作为预售票购买
+          </div>
           <el-form-item
             label="划线价"
             prop="originPrice"
@@ -202,6 +215,7 @@ export default {
         picUrl: "", // 图片
         facePrice: "", // 面值
         salePrice: "", // 售价
+        prePrice: 0, //预购价
         quantity: "", // 数量
         pkgUnit: 200, // 张数
         pkgSalePrice: 0, // 单价
@@ -244,6 +258,15 @@ export default {
             trigger: ["blur", "change"],
           },
         ],
+        prePrice: [
+          { required: true, message: "请输入预付售票价", trigger: "blur" },
+          {
+            pattern:
+              /^([0-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/,
+            message: "请输入合法的金额数字，最多两位小数",
+            trigger: ["blur", "change"],
+          },
+        ],
         quantity: [
           { required: true, message: "请输入数量", trigger: "blur" },
           {
@@ -326,7 +349,7 @@ export default {
         boxId: this.id
       }
       ticketBoxDetail(data).then(res => {
-        const { awardsList, type, title, picUrl, facePrice, salePrice, quantity, originPrice, pkgUnit, pkgSalePrice, saleCommRate, saleChannelType, channelList } = res.data
+        const { awardsList, type, title, picUrl, facePrice, salePrice, prePrice, quantity, originPrice, pkgUnit, pkgSalePrice, saleCommRate, saleChannelType, channelList } = res.data
         this.form = {
           disabled:true,
           title, picUrl, quantity, pkgUnit, saleCommRate, saleChannelType,
@@ -334,6 +357,7 @@ export default {
           type: JSON.parse(type).value,
           facePrice:accDiv(facePrice, 100),
           salePrice:accDiv(salePrice, 100),
+          prePrice:accDiv(prePrice,100),
           pkgSalePrice:accDiv(pkgSalePrice, 100),
           originPrice:accDiv(originPrice, 100)
         }
@@ -452,6 +476,7 @@ export default {
             ...this.form,
             facePrice: accMul(this.form.facePrice, 100),
             salePrice: accMul(this.form.salePrice, 100),
+            prePrice: accMul(this.form.prePrice, 100),
             pkgSalePrice: accMul(this.form.pkgSalePrice, 100),
             originPrice: accMul(this.form.originPrice, 100),
             awardsList: filterArr2,

src/views/business/ticket/detail.vue

@@ -26,6 +26,10 @@
           <span :class="loading ? 'el-icon-loading' : ''"></span>
           {{ info && info.salePrice && $numberFormat(info.salePrice) }}元
         </el-form-item>
+        <el-form-item label="预付售票价:">
+          <span :class="loading ? 'el-icon-loading' : ''"></span>
+          {{ info && info.prePrice && $numberFormat(info.prePrice) }}元/张
+        </el-form-item>
         <el-form-item label="划线价:" v-if="info && info.type && info.type.value == 'online'">
           <span :class="loading ? 'el-icon-loading' : ''"></span>
           {{ info && info.originPrice && $numberFormat(info.originPrice) }}元

src/views/business/ticket/index.vue

@@ -14,9 +14,9 @@
           clearable
           size="small"
           style="width: 240px"
-          @clear="handleQuery"
-          @keyup.enter.native="handleQuery"
-        />
+          @change="pageParams.pageNum = 1;handleQuery()"
+
+        /><!--          @keyup.enter.native="handleQuery"-->
       </el-form-item>
       <el-form-item label="盲票组类型" prop="type">
         <el-select
@@ -24,7 +24,7 @@
           placeholder="请选择盲票组类型"
           clearable
           size="small"
-          @change="handleQuery"
+          @change="pageParams.pageNum = 1;handleQuery()"
         >
           <el-option label="全部" value="" />
           <el-option label="线上票" value="online" />
@@ -37,7 +37,7 @@
           placeholder="请选择盲票组状态"
           clearable
           size="small"
-          @change="handleQuery"
+          @change="pageParams.pageNum = 1;handleQuery()"
         >
           <el-option label="全部" value="" />
           <el-option label="待出票" value="wait" />
@@ -52,7 +52,7 @@
           type="primary"
           icon="el-icon-search"
           size="mini"
-          @click="handleQuery"
+          @click="pageParams.pageNum = 1;handleQuery()"
           >搜索</el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -166,6 +166,11 @@
           <div>￥{{ $numberFormat(scope.row.pkgSalePrice) }}/包</div>
         </template>
       </el-table-column>
+      <el-table-column label="预付售票价" prop="pkgPrePrice" min-width="100">
+        <template slot-scope="scope">
+          <div>￥{{ $numberFormat(scope.row.pkgPrePrice) }}/包</div>
+        </template>
+      </el-table-column>
       <el-table-column label="已采购数量" prop="salePkgQty" min-width="110" sortable="custom">
         <template slot-scope="scope">
           <div>{{ scope.row.salePkgQty }}包</div>

src/views/finance/withdraw/index.vue

@@ -14,7 +14,7 @@
           clearable
           size="small"
           style="width: 240px"
-          @keyup.enter.native="handleQuery"
+          @change="pageParams.pageNum = 1;handleQuery()"
         />
       </el-form-item>
       <el-form-item label="申请时间">
@@ -218,10 +218,12 @@ export default {
       if (e) {
         this.queryParams.startDay = e[0];
         this.queryParams.endDay = e[1];
+        this.pageParams.pageNum = 1
         this.handleQuery();
       } else {
         this.queryParams.startDay = "";
         this.queryParams.endDay = "";
+        this.pageParams.pageNum = 1
         this.handleQuery();
       }
     },
@@ -255,4 +257,4 @@ export default {
 ::v-deep .el-tabs--border-card > .el-tabs__content {
   padding: 0;
 }
-</style>
+</style>

src/views/order/channel/index.vue

@@ -14,9 +14,17 @@
           clearable
           size="small"
           style="width: 240px"
-          @keyup.enter.native="handleQuery"
+          @change="pageParams.pageNum = 1;handleQuery()"
         />
       </el-form-item>
+
+      <el-form-item label="订单类型" prop="orderId">
+        <el-select v-model="queryParams.type" placeholder="请选择订单类型" style="width: 100%;" clearable :filter-method="dataFilter" @change="pageParams.pageNum = 1;handleQuery()" >
+          <el-option label="全部" value="" />
+          <el-option v-for="(item,index) in typeList"  :label="item.dictLabel" :value="Number(item.dictValue)" :key="index"/>
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="订单号" prop="orderId">
         <el-input
           v-model="queryParams.orderId"
@@ -24,7 +32,7 @@
           clearable
           size="small"
           style="width: 240px"
-          @keyup.enter.native="handleQuery"
+          @change="pageParams.pageNum = 1;handleQuery()"
         />
       </el-form-item>
       <el-form-item label="经销商" prop="channelId">
@@ -35,7 +43,7 @@
           filterable
           clearable
           :filter-method="dataFilter"
-          @change="handleQuery"
+          @change="pageParams.pageNum = 1;handleQuery()"
         >
           <el-option
             v-for="(item, index) in siteList"
@@ -85,7 +93,7 @@
           type="primary"
           icon="el-icon-search"
           size="mini"
-          @click="handleQuery"
+          @click="pageParams.pageNum = 1;handleQuery()"
           >搜索</el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -135,7 +143,12 @@
               </div>
             </el-table-column>
             <el-table-column label="盲票组名称" prop="title" min-width="80" />
-            <el-table-column label="采购单价(元)" min-width="100">
+            <el-table-column v-if="row.type && JSON.parse(row.type).value == 1 " label="采购单价(元/包)" min-width="100">
+              <template slot-scope="{ row }">
+                <div>{{ $numberFormat(row.pkgSalePrice) }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column v-else label="预付票售价(元/包)" min-width="100">
               <template slot-scope="{ row }">
                 <div>{{ $numberFormat(row.pkgSalePrice) }}</div>
               </template>
@@ -149,6 +162,15 @@
         </template>
       </el-table-column>
       <el-table-column label="订单号" prop="orderId" min-width="80" />
+      <el-table-column label="订单类型" prop="orderId" min-width="80" align="center">
+        <template slot-scope="{ row }">
+          <div>
+            <div v-if="row.type && JSON.parse(row.type).value == 1">普通票</div>
+            <div v-if="row.type && JSON.parse(row.type).value == 2" style="color: red">线下预付票</div>
+            <div v-if="row.type && JSON.parse(row.type).value == 3">线上预付票</div>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="下单时间" min-width="100">
         <template slot-scope="{ row }">
           <div>
@@ -274,6 +296,7 @@ export default {
       boxData: [],
       siteList:[],
       siteCopyList:[],
+      typeList: []
     };
   },
   mounted() {
@@ -281,6 +304,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getTypeList()
   },
   methods: {
     // 订单列表
@@ -314,6 +338,13 @@ export default {
         });
     },
 
+    //订单类型筛选列表
+    getTypeList(){
+      this.getDicts('channel_order_type').then(res=>{
+        this.typeList = res.data
+      })
+    },
+
     // 盲票组列表
     getBoxList(row) {
       boxList({ orderId: row.orderId }).then((res) => {
@@ -370,10 +401,12 @@ export default {
       if (e) {
         this.queryParams.startTime = e[0];
         this.queryParams.endTime = e[1];
+        this.pageParams.pageNum = 1
         this.handleQuery();
       } else {
         this.queryParams.startTime = "";
         this.queryParams.endTime = "";
+        this.pageParams.pageNum = 1
         this.handleQuery();
       }
     },

src/views/order/deliver/index.vue

@@ -14,7 +14,7 @@
           clearable
           size="small"
           style="width: 240px"
-          @keyup.enter.native="handleQuery"
+          @change="pageParams.pageNum = 1;handleQuery()"
         />
       </el-form-item>
       <el-form-item label="商品名称">
@@ -24,7 +24,7 @@
           clearable
           size="small"
           style="width: 240px"
-          @keyup.enter.native="handleQuery"
+          @change="pageParams.pageNum = 1;handleQuery()"
         />
       </el-form-item>
       <el-form-item label="订单类型">
@@ -35,7 +35,7 @@
           size="small"
           filterable
           clearable
-          @change="handleQuery"
+          @change="pageParams.pageNum = 1;handleQuery()"
         >
           <el-option label="全部" value=""></el-option>
           <el-option label="提货订单" value="1"></el-option>
@@ -49,7 +49,7 @@
           clearable
           size="small"
           style="width: 240px"
-          @keyup.enter.native="handleQuery"
+          @change="pageParams.pageNum = 1;handleQuery()"
         />
       </el-form-item>
       <el-form-item label="下单时间">
@@ -72,7 +72,7 @@
           clearable
           size="small"
           style="width: 240px"
-          @keyup.enter.native="handleQuery"
+          @change="pageParams.pageNum = 1;handleQuery()"
         />
       </el-form-item>
       <el-form-item>
@@ -80,7 +80,7 @@
           type="primary"
           icon="el-icon-search"
           size="mini"
-          @click="handleQuery"
+          @click="pageParams.pageNum = 1;handleQuery()"
           >搜索</el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -333,10 +333,12 @@ export default {
       if (e) {
         this.queryParams.startTime = e[0];
         this.queryParams.endTime = e[1];
+        this.pageParams.pageNum = 1
         this.handleQuery();
       } else {
         this.queryParams.startTime = "";
         this.queryParams.endTime = "";
+        this.pageParams.pageNum = 1
         this.handleQuery();
       }
     },