1. 优化

src/views/order/orderMr/dialog/details.vue

@@ -47,6 +47,9 @@
         <el-col :span="12">
           <div style="display: flex;" class="grid-content bg-purple item-class">购票渠道: <span style="display: block;margin-left: 5px;"><dict-tag :options="dict.type.order_form_type" :value="form.source"/></span></div>
         </el-col>
+        <el-col :span="12" v-if="form.sourceRemark">
+          <div style="display: flex;" class="grid-content bg-purple item-class">来源备注: <span style="display: block;margin-left: 5px;"> {{ form.sourceRemark }} </span></div>
+        </el-col>
         <el-col :span="12" v-if="form.orderIdOrQrCode">
           <div style="display: flex;" class="grid-content bg-purple item-class">核销码: <span style="display: block;margin-left: 5px;"><span>{{ form.orderIdOrQrCode }}</span></span></div>
         </el-col>
@@ -71,6 +74,9 @@
         <el-col :span="12">
           <div class="grid-content bg-purple item-class" style="display: flex;">订单状态: <span style="display: block;margin-left: 5px;"><dict-tag :options="dict.type.order_status_type" :value="form.status"/></span></div>
         </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class" style="display: flex;">订单备注: <span style="display: block;margin-left: 5px;">{{ form.remark }}</span></div>
+        </el-col>
       </el-row>
 
 
@@ -91,8 +97,12 @@
             </el-table-column>
             <el-table-column label="核销时间" align="center" prop="qrcodeUseTime" />
             <el-table-column label="座位信息" align="center" prop="seatName" />
-            <el-table-column label="人员类别" align="center" prop="seatName1" />
-            <el-table-column label="备注" align="center" prop="seatName12" />
+            <el-table-column label="人员类别" align="center">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.personnel_type" :value="scope.row.identity"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" prop="remark" />
           </el-table>
         </el-col>
       </el-row>
@@ -109,7 +119,7 @@
 import { getSelectById } from '@/api/order/orderMr'
 export default {
   name: "detailsDia",
-  dicts: ['order_form_type','order_status_type','pay_way_type'],
+  dicts: ['order_form_type','order_status_type','pay_way_type','personnel_type'],
   data() {
     return {
       title: "编辑",

src/views/windowTicketSales/model/increaseViewers.vue

@@ -75,12 +75,7 @@
                     width="140">
                     <template slot-scope="scope">
                         <div>
-                            <span v-if="actionIndex != scope.row.id">{{ 
-                                scope.row.identity?
-                                personnelType.find((item)=>{
-                                    return item.id == scope.row.identity
-                                }).name : ''
-                             }}</span>
+                             <dict-tag v-if="actionIndex != scope.row.id" :options="dict.type.personnel_type" :value="scope.row.identity"/>
                             <el-select
                                 size="mini"
                                 v-else
@@ -90,10 +85,10 @@
                                 style="width: 100%"
                             >
                                 <el-option
-                                v-for="dict in personnelType"
-                                :key="dict.id"
-                                :label="dict.name"
-                                :value="dict.id"
+                                v-for="dict in dict.type.personnel_type"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
                                 />
                             </el-select>
                         </div>
@@ -163,7 +158,7 @@
                             <el-radio label="11">携程</el-radio>
                             <el-radio label="13">抖音</el-radio>
                             <el-radio label="14">猫眼</el-radio>
-                            <el-radio label="15">去哪儿</el-radio>
+                            <!-- <el-radio label="15">去哪儿</el-radio> -->
                             <el-radio label="16">其他</el-radio>
                         </el-radio-group>
                     </el-form-item>
@@ -261,6 +256,7 @@ import {
  const https = require('https');
  const axios = require('axios');
   export default {
+    dicts: ['personnel_type'],
     data() {
       return {
         loading: false,
@@ -321,13 +317,6 @@ import {
         websocketData: null,
 
         idcardLoading: false,
-        personnelType: [
-            { id: "0" , name:'无' },
-            { id: "1", name:'现役军人' },
-            { id: "2" , name:'警察' },
-            { id: "3" , name:'消防员' },
-            { id: "4" , name:'残疾军人' }
-        ],
         payTime: null, // 支付等待时间
         payTimeNum: 0,
         printListId: null,
@@ -770,14 +759,20 @@ import {
                                 clearInterval(this.payTime)
                             }
                             if(this.ruleForm.paymentType == 2){
-                                this.$message('订单入库成功');
+                                this.$message({
+                                    message: '订单入库成功',
+                                    type: 'success'
+                                });
                                 this.loading = false
                                 // this.payStatus = 8
                                 // this.getPrintListApi()
                                 this.goTicketingCollections()
                                 
                             }else {
-                                this.$message('用户已支付成功,请打印门票');
+                                this.$message({
+                                    message: '用户已支付成功,请打印门票',
+                                    type: 'success'
+                                });
                                 // 开始 打印
                                 this.loading = false
                                 // this.payStatus = 8