修改

src/components/GlobalComponents/OrderDetail.vue

@@ -385,8 +385,14 @@
             <el-table-column prop="ticketNo" label="票号">
             </el-table-column>
             <el-table-column prop="oldValue" label="修改前">
+              <template slot-scope="scope">
+                {{ getValueDetail(scope.row, 'oldValue') }}
+              </template>
             </el-table-column>
             <el-table-column prop="newValue" label="修改后">
+              <template slot-scope="scope">
+                {{ getValueDetail(scope.row, 'newValue') }}
+              </template>
             </el-table-column>
             <el-table-column prop="updateAdminName" label="操作人">
             </el-table-column>
@@ -557,6 +563,20 @@ export default {
   methods: {
     getPayStatus,
     getPayResponse,
+    getValueDetail (row, key) {
+      console.log(row, key)
+      if (row.updateType === 'updatePlayDate') {
+        try {
+          const val = JSON.parse(row[key])
+          if (val && val.playDateBegin && val.playDateEnd) {
+            return `${val.playDateBegin} - ${val.playDateEnd}`
+          }
+        } catch (error) {
+          return ''
+        }
+      }
+      return row[key]
+    },
     async show (data) {
       this.orderData = data
       this.visible = true
@@ -609,6 +629,8 @@ export default {
     },
     handleClose () {
       this.visible = false
+      this.activeTab = 'ticketCheckInfo'
+      this.orderData = null
     },
     copySuccess () {
       this.$message.success('复制成功')

src/pages/dashboard/chart/history.vue

@@ -37,7 +37,7 @@ let option = {
       type: 'category',
       data: [],
       axisLine: {
-        show: false
+        show: true
       },
       axisTick: {
         show: false
@@ -56,7 +56,7 @@ let option = {
       },
       type: 'value',
       axisLine: {
-        show: false
+        show: true
       },
       axisTick: {
         show: false
@@ -74,7 +74,7 @@ let option = {
       position: 'right',
       type: 'value',
       axisLine: {
-        show: false
+        show: true
       },
       axisTick: {
         show: false

src/pages/queryReport/salesQuery.vue

@@ -354,7 +354,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          width="90"
+          width="100"
           label="状态"
           fixed="right"
         >
@@ -365,10 +365,8 @@
         <el-table-column
           width="80"
           label="备注"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.remark }}
-          </template>
+          show-overflow-tooltip
+          prop="remark">
         </el-table-column>
         <el-table-column
           label="操作"
@@ -823,7 +821,7 @@
       title="补打"
       :visible.sync="secondPrintDialogVisible"
       width="80%"
-      @close="secondPrintDialogVisible=false">
+      @close="secondPrintDialogVisible=false;ticketNoSearch=''">
       <!-- <div class="">
         <div class="tag">退票金额</div>
         <el-input-number
@@ -831,9 +829,15 @@
           :min="0"
           :precision="0.01"></el-input-number>
       </div> -->
+      <div
+        class="search-area"
+        style="margin: 20px;display: flex;align-items: center;">
+        <div class="name" style="margin-right: 10px;">票号搜索</div>
+        <el-input v-model="ticketNoSearch"></el-input>
+      </div>
       <el-table
         border
-        :data="currentOrder.ticketList"
+        :data="(currentOrder.ticketList || []).filter(v => v.ticketNo.includes(ticketNoSearch))"
         @selection-change="handleSelectionChange">
         <el-table-column
           type="selection"
@@ -860,7 +864,7 @@
         <el-table-column width="100" prop="checkNum" label="检票人数">
         </el-table-column>
 
-        <el-table-column width="100" prop="payDateBegin" label="游玩时间">
+        <el-table-column width="95" prop="payDateBegin" label="游玩时间">
           <template slot-scope="scope">
             {{ scope.row.playDateBegin || scope.row.playDateEnd ? `${scope.row.playDateBegin || ''} - ${scope.row.playDateEnd || ''}` : "无限制" }}
           </template>
@@ -879,22 +883,35 @@
         </el-table-column>
         <el-table-column width="80" prop="price" label="小计">
         </el-table-column>
-        <el-table-column width="80" label="检票景点">
+        <el-table-column min-width="150" label="检票景点">
           <template slot-scope="scope">
-            <el-button
-              v-if="scope.row.ticketListScenic"
-              @click="showDetail(scope.row)"
-            >
-              明细
+            {{ (scope.row.ticketCheckScenicList || []).map(item => item.scenicName).join(',') }}
+          </template>
+        </el-table-column>
+        <el-table-column width="80" label="操作">
+          <template slot-scope="scope">
+            <el-button type="primary" @click="printSingleTicket(scope.row)">
+              打印
             </el-button>
           </template>
         </el-table-column>
       </el-table>
-      <span slot="footer">
-        <el-button @click="secondPrintDialogVisible = false">取消</el-button>
+      <div
+        class="opt-area"
+        style="margin-top: 20px;width: 100%;text-align: center;">
         <el-button
           type="primary"
-          @click="submitSecondPrint">确定</el-button>
+          @click="submitSecondPrint">
+          全部打印
+        </el-button>
+        <el-button
+          type="primary"
+          @click="submitSecondPrint">
+          打印小票
+        </el-button>
+      </div>
+      <span slot="footer">
+        <el-button @click="secondPrintDialogVisible = false">取消</el-button>
       </span>
     </el-dialog>
     <el-dialog
@@ -950,14 +967,9 @@
         </el-table-column>
         <el-table-column width="80" prop="price" label="小计">
         </el-table-column>
-        <el-table-column width="80" label="检票景点">
+        <el-table-column min-width="180" label="检票景点">
           <template slot-scope="scope">
-            <el-button
-              v-if="scope.row.ticketListScenic"
-              @click="showDetail(scope.row)"
-            >
-              明细
-            </el-button>
+            {{ scope.row.ticketCheckScenicList.map(item => item.scenicName).join(',') }}
           </template>
         </el-table-column>
       </el-table>
@@ -974,7 +986,7 @@
       mini-height="500"
       @close="cancelEdit">
       <el-form
-        class="search-box"
+        class="form-box"
         ref="formEl"
         :model="editOrderInfo"
         :inline="true"
@@ -1048,7 +1060,7 @@
           prop="playDateBegin">
           <el-date-picker
             v-model="editOrderInfo.playDateBegin"
-            type="datetime"
+            type="date"
             placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
@@ -1057,9 +1069,8 @@
           label="截止时间"
           prop="playDateEnd">
           <el-date-picker
-            default-time="23:59:59"
             v-model="editOrderInfo.playDateEnd"
-            type="datetime"
+            type="date"
             placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
@@ -1270,7 +1281,8 @@ export default {
         ticketIds: [],
         ticketList: [],
         ticketCheckScenicUpdateRequestList: []
-      }
+      },
+      ticketNoSearch: ''
     }
   },
   filters: {
@@ -1584,6 +1596,21 @@ export default {
         })
       })
     },
+    printSingleTicket (order) {
+      const ticketIdList = [order.id]
+
+      this.$confirm('确定要网络取票吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        printTickets(ticketIdList).then(res => {
+          if (res.code === '200') {
+            this.$message.success('操作成功')
+          }
+        })
+      })
+    },
     // 修改
     async editOrder (order) {
       await this.getOrderDetail(order)

src/styles/index.scss

@@ -708,4 +708,8 @@ h6 {
 
 .is-flex {
   display: flex;
+}
+
+.form-box {
+  padding: 20px 20px;
 }