bug修改

src/components/GlobalComponents/OrderDetail.vue

@@ -239,7 +239,7 @@
                     {{ scope.row.isInvoice ? "已开票" : "未开票" }}
                   </el-tag>
                 </div>
-                <div class=""><span>发票信息：</span><button @click="downloadInvoice(scope.row.invoiceDownloadUrl)">点击下载</button></div>
+                <div class=""><span>发票信息：</span><button @click.prevent.stop="downloadInvoice(scope.row.invoiceDownloadUrl)">点击下载</button></div>
               </template>
             </el-table-column>
 
@@ -859,9 +859,9 @@ export default {
       console.log(' downloadInvoice', url)
       if (!this.isValidUrl(url)) {
         this.$message.warning('暂无发票可下载')
-        return
+      } else {
+        window.open(url)
       }
-      window.open(url)
     }
   }
 }

src/pages/sellManage/common/TicketList.vue

@@ -337,6 +337,9 @@ export default {
     },
     ticketListMaxHeight () {
       return this.this.category === 'batch' ? '300px' : '500px'
+    },
+    isTeam () {
+      return this.category === 'ticket' && this.$route.meta.type === 'team'
     }
   },
   watch: {
@@ -410,12 +413,11 @@ export default {
         ticketTypeName: '',
         category: this.ticketType
       }
-      // 根据售票类型筛选团散票种：typeId=1(散客)筛选0和1，typeId=2(团队)筛选0和2
-      if (this.typeId === '1') {
-        params.teamIndividualList = [0, 1]
-      } else if (this.typeId === '2') {
-        params.teamIndividualList = [0, 2]
+      // 根据售票类型筛选团散票种：(散客)筛选0和1，(团队)筛选0和2
+      if (this.ticketType === 'ticket') {
+        params.teamIndividualList = this.isTeam ? [0, 2] : [0, 1]
       }
+
       getTicketTypeList(params).then(res => {
         this.tableData = res.data.records.map(item => {
           // 添加拼音首字母

src/pages/systemSetting/account.vue

@@ -88,10 +88,10 @@
             <span>{{ scope.row.type === 2 ? '组内员工' : scope.row.type === 1 ? '管理员' : '员工' }}</span>
           </template>
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="creator"
           label="创建人">
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           label="上次登录时间"
           width="140"

src/pages/systemSetting/account/EditDialog.vue

@@ -98,11 +98,8 @@
           <el-option
             :value="0"
             label="员工"></el-option>
-          <el-option
-            :value="2"
-            label="组内员工"></el-option>
         </el-select>
-        <Tip msg="普通员工只可以浏览自己的数据 管理员可以浏览全部数据 组内员工可以浏览自己组内全部用户数据"></Tip>
+        <Tip msg="普通员工只可以浏览自己的数据 管理员可以浏览全部数据"></Tip>
       </el-form-item>
     </div>
     <div class="dialog-btn-wrap">

src/pages/ticketSetting/batch.vue

@@ -108,10 +108,13 @@
               <div><span style="font-weight: bold">余量：</span><span style="color: green">{{ getDateLeftNum(date, scope.row) }}</span></div>
             </div>
             <div style="display:flex; justify-content: space-between; margin-top: 5px;">
-              <i
-                class="el-icon-s-opportunity"
-                :title="getDateStatus(date, scope.row) === 1 ? '可售' : '停售'"
-                :style="{ color: getDateStatus(date, scope.row) === 1 ? 'green' : 'gray', fontSize: '16px' }"></i>
+              <div>
+                <i
+                  class="el-icon-s-opportunity"
+                  :title="getDateStatus(date, scope.row) === 1 ? '可售' : '停售'"
+                  :style="{ color: getDateStatus(date, scope.row) === 1 ? 'green' : 'red', fontSize: '16px' }"></i>
+                <span :style="{ color: getDateStatus(date, scope.row) === 1 ? 'green' : 'red', fontSize: '14px' }">{{ getDateStatus(date, scope.row) === 1 ? '可售' : '停售' }}</span>
+              </div>
               <i
                 class="el-icon-edit"
                 @click="editDate(date, scope.row)"></i>