ソースを参照

fix: 子项目编辑以及售票员等优化

LaveyD 2 ヶ月 前
コミット
e559c75bb1

+ 2 - 7
src/pages/checkerManage/subProjectManage.vue

@@ -136,13 +136,12 @@
           prop="adminIds">
           <el-select
             multiple
-            clearable
             v-model="currentItem.adminIds">
             <el-option
               v-for="item in adminList"
               :key="item.id"
               :value="item.id"
-              :label="item.loginName">
+              :label="`${item.loginName}-${item.name}`">
             </el-option>
           </el-select>
         </el-form-item>
@@ -152,7 +151,6 @@
           prop="ticketTypeIds">
           <el-select
             multiple
-            clearable
             v-model="currentItem.ticketTypeIds">
             <el-option
               v-for="item in ticketTypeList"
@@ -168,7 +166,6 @@
           prop="scenicIds">
           <el-select
             multiple
-            clearable
             v-model="currentItem.scenicIds">
             <el-option
               v-for="item in scenicList"
@@ -184,7 +181,6 @@
           prop="payChannelIds">
           <el-select
             multiple
-            clearable
             v-model="currentItem.payChannelIds">
             <el-option
               v-for="item in payChannelList"
@@ -200,8 +196,7 @@
           prop="checkerIds">
           <el-select
             v-model="currentItem.checkerIds"
-            multiple
-            clearable>
+            multiple>
             <el-option
               v-for="item in deviceList"
               :key="item.id"

+ 4 - 0
src/pages/member/memberCheckLog.vue

@@ -112,6 +112,10 @@
             label="人工检票"
             value="person"
           ></el-option>
+          <el-option
+            label="系统自动检票"
+            value="system_check"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item

+ 8 - 1
src/pages/member/memberCheckStatistics/EnterAreaTimeCount.vue

@@ -129,7 +129,14 @@ export default {
         keyWords3: ''
       },
       tableData: [],
-      checkType: [{ type: 'finger', name: '指纹' }, { type: 'face', name: '人脸' }, { type: 'idcard', name: '身份证' }, { type: 'iccard', name: 'IC卡' }, { name: '人工检票', value: 'person' }],
+      checkType: [
+        { type: 'finger', name: '指纹' },
+        { type: 'face', name: '人脸' },
+        { type: 'idcard', name: '身份证' },
+        { type: 'iccard', name: 'IC卡' },
+        { type: 'person', name: '人工检票' },
+        { type: 'system_check', name: '系统自动检票' }
+      ],
       memberTypeList: [],
       loading: false
     }

+ 1 - 1
src/pages/queryReport/OrderStatistic.vue

@@ -87,7 +87,7 @@
           <el-option
             v-for="item in salesList"
             :key="item.id"
-            :label="item.name"
+            :label="`${item.loginName}-${item.name}`"
             :value="item.id">
           </el-option>
         </el-select>

+ 3 - 1
src/pages/queryReport/checkQuery.vue

@@ -174,7 +174,7 @@
             v-for="item in accountList"
             :key="item.id"
             :value="item.id"
-            :label="item.loginName">
+            :label="`${item.loginName}-${item.name}`">
           </el-option>
         </el-select>
       </el-form-item>
@@ -400,6 +400,8 @@ export default {
           return '取票即检票'
         case 'buy_check':
           return '购买即检票'
+        case 'system_check':
+          return '系统自动检票'
         default:
           break
       }

+ 8 - 0
src/pages/queryReport/memberVisitsStatistics/ByPercent.vue

@@ -73,6 +73,14 @@
             label="身份证"
             value="idcard"
           ></el-option>
+          <el-option
+            label="人工检票"
+            value="person"
+          ></el-option>
+          <el-option
+            label="系统自动检票"
+            value="system_check"
+          ></el-option>
         </el-select>
       </el-form-item>
 

+ 8 - 0
src/pages/queryReport/memberVisitsStatistics/ByTimes.vue

@@ -73,6 +73,14 @@
             label="身份证"
             value="idcard"
           ></el-option>
+          <el-option
+            label="人工检票"
+            value="person"
+          ></el-option>
+          <el-option
+            label="系统自动检票"
+            value="system_check"
+          ></el-option>
         </el-select>
       </el-form-item>
 

+ 1 - 1
src/pages/queryReport/refundQuery/RefundQuery.vue

@@ -174,7 +174,7 @@
             v-for="item in accountList"
             :key="item.id"
             :value="item.id"
-            :label="item.loginName">
+            :label="`${item.loginName}-${item.name}`">
           </el-option>
         </el-select>
       </el-form-item>

+ 1 - 1
src/pages/queryReport/salesQuery.vue

@@ -206,7 +206,7 @@
             v-for="item in accountList"
             :key="item.id"
             :value="item.id"
-            :label="item.loginName">
+            :label="`${item.loginName}-${item.name}`">
           </el-option>
         </el-select>
       </el-form-item>

+ 1 - 1
src/pages/systemSetting/loginLog.vue

@@ -19,7 +19,7 @@
           <el-option
             v-for="item in accountList"
             :key="item.id"
-            :label="item.loginName"
+            :label="`${item.loginName}-${item.name}`"
             :value="item.id">
           </el-option>
         </el-select>

+ 1 - 1
src/pages/systemSetting/operationLog.vue

@@ -19,7 +19,7 @@
           <el-option
             v-for="item in accountList"
             :key="item.id"
-            :label="item.loginName"
+            :label="`${item.loginName}-${item.name}`"
             :value="item.id">
           </el-option>
         </el-select>