浏览代码

盲票列表新增预付票售价字段,经销商盲票订单添加订单类型及订单类型筛选及预付票售价

DELL 3 年之前
父节点
当前提交
369118f330

+ 3 - 3
src/views/business/ticket/create.vue

@@ -49,12 +49,12 @@
               <template slot="append">元</template>
             </el-input>
           </el-form-item>
-          <el-form-item label="预付售价" prop="prePrice">
+          <el-form-item label="预付售价" prop="prePrice">
             <el-input
               v-model="form.prePrice"
               style="width: 240px"
               size="small"
-              placeholder="请输入预付售价"
+              placeholder="请输入预付售价"
             >
               <template slot="append">元</template>
             </el-input>
@@ -256,7 +256,7 @@ export default {
           },
         ],
         prePrice: [
-          { required: true, message: "请输入预付售价", trigger: "blur" },
+          { required: true, message: "请输入预付售价", trigger: "blur" },
           {
             pattern:
               /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/,

+ 1 - 1
src/views/business/ticket/detail.vue

@@ -26,7 +26,7 @@
           <span :class="loading ? 'el-icon-loading' : ''"></span>
           {{ info && info.salePrice && $numberFormat(info.salePrice) }}元
         </el-form-item>
-        <el-form-item label="预付售价:">
+        <el-form-item label="预付售价:">
           <span :class="loading ? 'el-icon-loading' : ''"></span>
           {{ info && info.prePrice && $numberFormat(info.prePrice) }}元
         </el-form-item>

+ 1 - 1
src/views/business/ticket/index.vue

@@ -166,7 +166,7 @@
           <div>¥{{ $numberFormat(scope.row.pkgSalePrice) }}/包</div>
         </template>
       </el-table-column>
-      <el-table-column label="预付售价" prop="prePrice" min-width="100" sortable="custom">
+      <el-table-column label="预付售价" prop="prePrice" min-width="100" sortable="custom">
         <template slot-scope="scope">
           <div>¥{{ $numberFormat(scope.row.prePrice) }}/包</div>
         </template>

+ 32 - 1
src/views/order/channel/index.vue

@@ -17,6 +17,14 @@
           @keyup.enter.native="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="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"
@@ -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="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="JSON.parse(row.type).value == 1">普通票</div>
+            <div v-if="JSON.parse(row.type).value == 2" style="color: red">线下预付票</div>
+            <div v-if="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) => {