Inicio Explorar Axuda
Rexistro Iniciar sesión
HHPW
/
clearticket_ota
2
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

修改

dct hai 9 meses
pai
43c796b38a
achega
e7aa222180
Modificáronse 24 ficheiros con 101 adicións e 51 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 1 1
      docs/devConfig/index.html
  2. 1 1
      index.html
  3. 0 1
      src/assets/css/index.css
  4. 2 2
      src/main.js
  5. 9 0
      src/styles/element-ui.scss
  6. 2 1
      src/views/goodsCenter/goodsList.vue
  7. 1 1
      src/views/goodsCenter/invoiceChannelList.vue
  8. 1 1
      src/views/goodsCenter/invoiceList.vue
  9. 1 1
      src/views/goodsCenter/invoiceSellerList.vue
  10. 5 3
      src/views/goodsCenter/otaList.vue
  11. 14 4
      src/views/goodsCenter/priceList.vue
  12. 1 1
      src/views/login/index.vue
  13. 4 2
      src/views/queryReport/cancelReport.vue
  14. 2 2
      src/views/queryReport/checkAndPrintQuery.vue
  15. 5 4
      src/views/queryReport/checkAndPrintReport.vue
  16. 2 2
      src/views/queryReport/checkReport.vue
  17. 24 7
      src/views/queryReport/orderList.vue
  18. 4 4
      src/views/queryReport/otaPaymentAmountLog.vue
  19. 1 1
      src/views/queryReport/refundAudit.vue
  20. 4 2
      src/views/queryReport/reportExport.vue
  21. 4 2
      src/views/queryReport/salesReport.vue
  22. 4 3
      src/views/systemSetting/account.vue
  23. 7 3
      src/views/systemSetting/role.vue
  24. 2 2
      src/views/systemSetting/systemConfig.vue

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
docs/devConfig/index.html


+ 1 - 1
index.html
Ver ficheiro 

@@ -5,7 +5,7 @@
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <link rel="icon" href="./favicon.ico">
 
     <link rel="stylesheet" href="./font/iconfont.css">
 
-    <title>OTA分销系统</title>
 
+    <title>线上分销系统</title>
 
     <script>document.write("<script type='text/javascript' src='./otaConfig.js?v=" + Date.now() + "'><\/script>");</script>
 
   </head>
 
   <body>

+ 0 - 1
src/assets/css/index.css
Ver ficheiro 

@@ -2168,7 +2168,6 @@
 
   text-overflow: ellipsis;
 
   vertical-align: middle;
 
   position: relative;
 
-  text-align: left
 
 }
 
 
 .el-table th div, .el-table th>.cell {

+ 2 - 2
src/main.js
Ver ficheiro 

@@ -64,7 +64,7 @@ Vue.mixin({
 
   data () {
 
     return {
 
       project: '',
 
-      pageTitle: 'OTA分销系统'
 
+      pageTitle: '线上分销系统'
 
     }
 
   },
 
   mounted () {
 
@@ -75,7 +75,7 @@ Vue.mixin({
 
         // cleartv: '徽黄科技'
 
         cleartv: ''
 
       }
 
-      this.pageTitle = (titleMap[this.project] || '') + 'OTA分销系统'
 
+      this.pageTitle = (titleMap[this.project] || '') + '线上分销系统'
 
 
       localStorage.project = this.project
 
     }

+ 9 - 0
src/styles/element-ui.scss
Ver ficheiro 

@@ -188,6 +188,15 @@
 
   tr th:first-child .cell {
 
     padding-left: 24px;
 
   }
 
+
 
+  .el-table__row {
 
+    &.is-center {
 
+      text-align: center;
 
+    }
 
+    &.is-right {
 
+      text-align: right;
 
+    }
 
+  }
 
 }
 
 
 //覆盖一些element-ui样式

+ 2 - 1
src/views/goodsCenter/goodsList.vue
Ver ficheiro 

@@ -46,9 +46,10 @@
 
     </div>
 
 
     <div class="tableBox">
 
-      <div class="block-title">查询信息</div>
 
+      <!-- <div class="block-title">查询信息</div> -->
 
       <el-table
 
         stripe
 
+        row-class-name="is-center"
 
         v-loading="loading"
 
         :data="tableData"
 
       >

+ 1 - 1
src/views/goodsCenter/invoiceChannelList.vue
Ver ficheiro 

@@ -1,7 +1,7 @@
 
 <template>
 
   <div class="form-wrap">
 
     <div class="tableBox">
 
-      <div class="block-title">查询信息</div>
 
+      <!-- <div class="block-title">查询信息</div> -->
 
       <el-table
 
         stripe
 
         :data="tableData"

+ 1 - 1
src/views/goodsCenter/invoiceList.vue
Ver ficheiro 

@@ -98,7 +98,7 @@
 
       </div>
 
     </div>
 
     <div class="tableBox">
 
-      <div class="block-title">查询信息</div>
 
+      <!-- <div class="block-title">查询信息</div> -->
 
       <el-table
 
         stripe
 
         :data="tableData"

+ 1 - 1
src/views/goodsCenter/invoiceSellerList.vue
Ver ficheiro 

@@ -1,7 +1,7 @@
 
 <template>
 
   <div class="form-wrap">
 
     <div class="tableBox">
 
-      <div class="block-title">查询信息</div>
 
+      <!-- <div class="block-title">查询信息</div> -->
 
       <el-table
 
         stripe
 
         :data="tableData"

+ 5 - 3
src/views/goodsCenter/otaList.vue
Ver ficheiro 

@@ -37,14 +37,16 @@
 
         <el-button
 
           type="primary"
 
           plain
 
-          @click="showDialog('add')">创建分销商</el-button>
 
+          @click="showDialog('add')">添加分销商</el-button>
 
       </div>
 
     </div>
 
 
     <div class="tableBox">
 
-      <div class="block-title">查询信息</div>
 
+      <!-- <div class="block-title">查询信息</div> -->
 
       <el-table
 
         :data="tableData"
 
+        stripe
 
+        row-class-name="is-center"
 
         v-loading="loading">
 
         <el-table-column
 
           label="#"
 
@@ -62,7 +64,7 @@
 
         </el-table-column>
 
 
         <el-table-column
 
-          label="编码"
 
+          label="分销商编码"
 
           prop="otaSourceCode">
 
         </el-table-column>

+ 14 - 4
src/views/goodsCenter/priceList.vue
Ver ficheiro 

@@ -6,6 +6,13 @@
 
         :model="form"
 
         :inline="true"
 
         label-width="150px">
 
+        <el-form-item
 
+          label="产品ID"
 
+          prop="otaProductId">
 
+          <el-input
 
+            v-model="form.otaProductId"
 
+            clearable></el-input>
 
+        </el-form-item>
 
         <el-form-item
 
           label="分销商名称"
 
           prop="otaSourceId">
 
@@ -57,7 +64,9 @@
 
         <el-form-item
 
           label="价格"
 
           prop="salePrice">
 
-          <el-input v-model="form.salePrice"></el-input>
 
+          <el-input
 
+            v-model="form.salePrice"
 
+            clearable></el-input>
 
         </el-form-item>
 
       </el-form>
 
       <div class="btn-wrap">
 
@@ -69,17 +78,18 @@
 
           type="primary"
 
           plain
 
           v-if="canEdit"
 
-          @click="showDialog('add')">创建价格码</el-button>
 
+          @click="showDialog('add')">创建产品</el-button>
 
         <el-button
 
           type="danger"
 
           @click="batchDelete">批量删除</el-button>
 
       </div>
 
     </div>
 
     <div class="tableBox">
 
-      <div class="block-title">查询信息</div>
 
+      <!-- <div class="block-title">查询信息</div> -->
 
       <el-table
 
         stripe
 
         :data="tableData"
 
+        row-class-name="is-center"
 
         @selection-change="handleSelectionChange"
 
         v-loading="loading">
 
         <el-table-column
 
@@ -107,7 +117,7 @@
 
           </template>
 
         </el-table-column> -->
 
         <el-table-column
 
-          label="价格码"
 
+          label="产品ID"
 
           prop="id">
 
           <template
 
             slot="header">

+ 1 - 1
src/views/login/index.vue
Ver ficheiro 

@@ -13,7 +13,7 @@
 
               :src="logo"
 
               class="logo"
 
             > -->
 
-            <h1>欢迎使用  {{ pageTitle || 'OTA分销系统' }}</h1>
 
+            <h1>欢迎使用  {{ pageTitle || '线上分销系统' }}</h1>
 
           </div>
 
           <h3>
 
             用户登录

+ 4 - 2
src/views/queryReport/cancelReport.vue
Ver ficheiro 

@@ -71,11 +71,13 @@
 
     </div>
 
 
     <div class="tableBox">
 
-      <div class="block-title">
 
+      <!-- <div class="block-title">
 
         查询信息
 
-      </div>
 
+      </div> -->
 
       <el-table
 
         :data="tableData"
 
+        stripe
 
+        row-class-name="is-center"
 
         v-loading="loading">
 
         <el-table-column
 
           prop="otaSourceName"

+ 2 - 2
src/views/queryReport/checkAndPrintQuery.vue
Ver ficheiro 

@@ -178,9 +178,9 @@
 
     </div>
 
 
     <div class="tableBox">
 
-      <div class="block-title">
 
+      <!-- <div class="block-title">
 
         查询信息
 
-      </div>
 
+      </div> -->
 
       <el-table
 
         :data="tableData"
 
         v-loading="loading"

+ 5 - 4
src/views/queryReport/checkAndPrintReport.vue
Ver ficheiro 

@@ -80,14 +80,15 @@
 
     </div>
 
 
     <div class="tableBox">
 
-      <div class="block-title">
 
+      <!-- <div class="block-title">
 
         查询信息
 
         <span style="font-size:13px;color:black">(包含检票+取票，与分销商对账请用此报表)</span>
 
-      </div>
 
+      </div> -->
 
       <el-table
 
         :data="tableData"
 
-        v-loading="loading"
 
-        :row-class-name="totalRowClassName">
 
+        stripe
 
+        row-class-name="is-center"
 
+        v-loading="loading">
 
         <el-table-column
 
           prop="otaSourceName"
 
           label="订单渠道">

+ 2 - 2
src/views/queryReport/checkReport.vue
Ver ficheiro 

@@ -150,9 +150,9 @@
 
     </div>
 
 
     <div class="tableBox">
 
-      <div class="block-title">
 
+      <!-- <div class="block-title">
 
         查询信息
 
-      </div>
 
+      </div> -->
 
       <el-table
 
         :data="tableData"
 
         v-loading="loading"

+ 24 - 7
src/views/queryReport/orderList.vue
Ver ficheiro 

@@ -160,11 +160,13 @@
 
     </div>
 
 
     <div class="tableBox">
 
-      <div class="block-title">
 
+      <!-- <div class="block-title">
 
         查询信息
 
-      </div>
 
+      </div> -->
 
       <el-table
 
         :data="tableData"
 
+        stripe
 
+        row-class-name="is-center"
 
         v-loading="loading">
 
         <el-table-column type="expand">
 
           <template
 
@@ -184,11 +186,12 @@
 
                       {{ ticketStatus[scope.row.status]&&ticketStatus[scope.row.status].label }}
 
                     </el-tag>
 
                   </div>
 
-                  <div class=""><span>票号二维码图片地址：</span>{{ scope.row.qrcodeUrl }}</div>
 
+                  <!-- <div class=""><span>票号二维码图片地址：</span>{{ scope.row.qrcodeUrl }}</div> -->
 
                 </template>
 
               </el-table-column>
 
               <el-table-column
 
                 prop="playDateBegin"
 
+                width="180"
 
                 label="游玩时间">
 
                 <template slot-scope="scope">
 
                   {{ scope.row.playDateBegin || scope.row.playDateEnd ? `${scope.row.playDateBegin || ''} - ${scope.row.playDateEnd || ''}` : "无限制" }}
 
@@ -199,7 +202,7 @@
 
                 label="付款时间">
 
               </el-table-column> -->
 
               <el-table-column
 
-                width="210"
 
+                min-width="210"
 
                 prop="guestInfo"
 
                 label="游客信息">
 
                 <template slot-scope="scope">
 
@@ -210,7 +213,7 @@
 
                 </template>
 
               </el-table-column>
 
               <el-table-column
 
-                width="260"
 
+                min-width="260"
 
                 prop="ticketCheckInfo"
 
                 label="检票信息">
 
                 <template slot-scope="scope">
 
@@ -222,7 +225,7 @@
 
                 </template>
 
               </el-table-column>
 
               <el-table-column
 
-                width="260"
 
+                min-width="260"
 
                 prop="ticketRefundInfo"
 
                 label="退票信息">
 
                 <template slot-scope="scope">
 
@@ -237,30 +240,37 @@
 
         </el-table-column>
 
         <el-table-column
 
           prop="otaSourceName"
 
+          min-width="120"
 
           label="订单来源渠道">
 
         </el-table-column>
 
         <el-table-column
 
           prop="orderNo"
 
+          min-width="180"
 
           label="订单号">
 
         </el-table-column>
 
         <el-table-column
 
           prop="partnerOrderNo"
 
+          min-width="120"
 
           label="合作方订单号">
 
         </el-table-column>
 
         <el-table-column
 
           prop="buyerName"
 
+          min-width="90"
 
           label="购买方名称">
 
         </el-table-column>
 
         <el-table-column
 
           prop="buyerPhone"
 
+          width="100"
 
           label="购买方电话">
 
         </el-table-column>
 
         <el-table-column
 
           prop="buyerIdentify"
 
+          width="150"
 
           label="购买方证件号">
 
         </el-table-column>
 
         <el-table-column
 
           prop="payStatus"
 
+          width="100"
 
           label="支付状态">
 
           <template slot-scope="scope">
 
             <el-tag
 
@@ -273,18 +283,22 @@
 
         </el-table-column>
 
         <el-table-column
 
           prop="price"
 
+          width="70"
 
           label="订单总价">
 
         </el-table-column>
 
         <el-table-column
 
           prop="payTime"
 
+          width="135"
 
           label="支付时间">
 
         </el-table-column>
 
         <el-table-column
 
           prop="closeTime"
 
+          width="135"
 
           label="关闭时间">
 
         </el-table-column>
 
         <el-table-column
 
           prop="otaCreateStatus"
 
+          width="100"
 
           label="创建状态">
 
           <template slot-scope="scope">
 
             {{ scope.row.otaCreateStatus === 1 ? '创建成功' : '初始化' }}
 
@@ -292,6 +306,7 @@
 
         </el-table-column>
 
         <el-table-column
 
           prop="isSelfOrder"
 
+          width="70"
 
           label="是否自营">
 
           <template slot-scope="scope">
 
             {{ scope.row.isSelfOrder === 1 ? '是' : '否' }}
 
@@ -299,6 +314,7 @@
 
         </el-table-column>
 
         <el-table-column
 
           prop="otaCreateMsg"
 
+          min-width="120"
 
           show-overflow-tooltip
 
           label="订单创建信息">
 
         </el-table-column>
 
@@ -312,6 +328,7 @@
 
         </el-table-column> -->
 
         <el-table-column
 
           fixed="right"
 
+          width="80"
 
           label="操作">
 
           <template slot-scope="scope">
 
             <!-- <el-button
 
@@ -437,7 +454,7 @@ export default {
 
     checkRefundVisible (item) {
 
       if (item.status !== 'CANCELED') return true
 
       if (item.status === 'CANCELED') {
 
-        if (item.tickets.some(i => i.status !== 'CANCELED')) {
 
+        if (item.tickets && item.tickets.some(i => i.status !== 'CANCELED')) {
 
           return true
 
         } else {
 
           return false

+ 4 - 4
src/views/queryReport/otaPaymentAmountLog.vue
Ver ficheiro 

@@ -79,13 +79,13 @@
 
     </div>
 
 
     <div class="tableBox">
 
-      <div class="block-title">
 
+      <!-- <div class="block-title">
 
         查询结果
 
-      </div>
 
+      </div> -->
 
       <el-table
 
         :data="tableData"
 
-        v-loading="loading"
 
-        :row-class-name="totalRowClassName">
 
+        row-class-name="is-center"
 
+        v-loading="loading">
 
         <el-table-column
 
           prop="otaSourceCode"
 
           label="编码">

+ 1 - 1
src/views/queryReport/refundAudit.vue
Ver ficheiro 

@@ -123,7 +123,7 @@
 
 
     <div class="tableBox">
 
       <div class="block-title">
 
-        查询信息
 
+        <!-- 查询信息 -->
 
         <div class="totalWrapper">
 
           <span>总张数：{{ totalObj.sumCount }}</span>&nbsp;&nbsp;
 
           <span>总金额：{{ totalObj.sumPrice }}</span>

+ 4 - 2
src/views/queryReport/reportExport.vue
Ver ficheiro 

@@ -73,12 +73,14 @@
 
     </div>
 
 
     <div class="tableBox">
 
-      <div class="block-title">
 
+      <!-- <div class="block-title">
 
         导出记录
 
-      </div>
 
+      </div> -->
 
 
       <el-table
 
         :data="tableData"
 
+        stripe
 
+        row-class-name="is-center"
 
         v-loading="loading">
 
         <el-table-column
 
           prop="type"

+ 4 - 2
src/views/queryReport/salesReport.vue
Ver ficheiro 

@@ -71,11 +71,13 @@
 
     </div>
 
 
     <div class="tableBox">
 
-      <div class="block-title">
 
+      <!-- <div class="block-title">
 
         查询信息
 
-      </div>
 
+      </div> -->
 
       <el-table
 
         :data="tableData"
 
+        stripe
 
+        row-class-name="is-center"
 
         v-loading="loading">
 
         <el-table-column
 
           prop="otaSourceName"

+ 4 - 3
src/views/systemSetting/account.vue
Ver ficheiro 

@@ -23,12 +23,13 @@
 
       </div>
 
     </div>
 
     <div class="tableBox">
 
-      <div class="block-title">
 
+      <!-- <div class="block-title">
 
         账号列表
 
-      </div>
 
-
 
+      </div> -->
 
       <el-table
 
         v-loading="loading"
 
+        stripe
 
+        row-class-name="is-center"
 
         :data="tableData">
 
         <el-table-column
 
           prop="loginName"

+ 7 - 3
src/views/systemSetting/role.vue
Ver ficheiro 

@@ -11,10 +11,14 @@
 
       </div>
 
     </div>
 
     <div class="tableBox">
 
-      <div class="block-title">
 
+      <!-- <div class="block-title">
 
         角色列表
 
-      </div>
 
-      <el-table :data="tableData">
 
+      </div> -->
 
+      <el-table
 
+        :data="tableData"
 
+        stripe
 
+        row-class-name="is-center"
 
+        v-loading="loading">
 
         <el-table-column
 
           prop="name"
 
           label="角色名"

+ 2 - 2
src/views/systemSetting/systemConfig.vue
Ver ficheiro 

@@ -49,9 +49,9 @@
 
     </div>
 
     <!-- 我是OTA系统管理 -->
 
     <div class="tableBox">
 
-      <div class="block-title">
 
+      <!-- <div class="block-title">
 
         系统配置列表
 
-      </div>
 
+      </div> -->
 
       <!-- 只展示抖音门店ID(douyin_poi_id)和美团合作方ID(meituan_partnerId) -->
 
       <el-table
 
         :data="tableData"