Przeglądaj źródła

1. 修复问题

MONSTER-ygh 6 miesięcy temu
rodzic
commit
6223199a0a

+ 5 - 2
src/App.vue

@@ -63,9 +63,12 @@ export default {
         flex-shrink: 0;
       }
       .app-container_table {
-        flex: auto;
+        flex: auto !important;
+        display: flex;
+        flex-direction: column;
         .app-container_table_main {
-          height: calc( 100% - 40px );
+          //height: calc( 100% - 40px ) !important;
+          flex: auto;
         }
       }
       .app-container_table_page {

+ 3 - 3
src/views/finance/Statements/quickReconciliation.vue

@@ -9,7 +9,7 @@
 <template>
   <div class="app-container app-container-scheduling">
     <div class="app-container_flex_auto">
-      <div class="app-container_table app-container-queryform" v-show="showSearch">
+      <div class="app-container_form app-container-queryform" v-show="showSearch">
         <!-- 页面查询表单 Start -->
         <el-form :model="queryParams" ref="queryForm" :rules="rules" :inline="true" label-width="68px">
           <el-form-item label="演出日期" label-width="80px">
@@ -58,8 +58,8 @@
             <el-table-column label="分销提现金额(元)" align="center" prop="personWithdrawPriceTotal" width="200" />
             <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button size="mini" type="text" @click="goStatementsIndexNew(scope.row)"
-                  v-hasPermi="['finance:Statements:quickReconciliation:difference']">查看差异</el-button>
+                <!-- <el-button size="mini" type="text" @click="goStatementsIndexNew(scope.row)"
+                  v-hasPermi="['finance:Statements:quickReconciliation:difference']">查看差异</el-button> -->
                 <el-button size="mini" type="text" @click="goStatementsIndexNew(scope.row)"
                   v-hasPermi="['finance:Statements:quickReconciliation:details']">对账详情</el-button>
               </template>

+ 10 - 6
src/views/venue/schedulingMr/dialog/addAndEdit.vue

@@ -121,24 +121,28 @@
             </el-table-column>
             <el-table-column label="开始时间" align="center">
               <template slot-scope="scope">
-                <el-time-select
+                <el-time-picker
                   v-model="scope.row.performTimeStart"
                   style="width: 100%"
+                  value-format="HH:mm"
+                  format="HH:mm"
                   @change="changValue(scope.row, 'start', scope.$index)"
-                  :picker-options="{ start: '08:00', step: '00:15', end: '23:30'}"
+                  :picker-options="{ selectableRange: '00:00:00 - 23:59:59'}"
                   placeholder="选择时间">
-                </el-time-select>
+                </el-time-picker>
               </template>
             </el-table-column>
             <el-table-column label="结束时间" align="center">
               <template slot-scope="scope">
-                <el-time-select
+                <el-time-picker
                   v-model="scope.row.performTimeEnd"
                   style="width: 100%"
+                  value-format="HH:mm"
+                  format="HH:mm"
                   @change="changValue(scope.row, 'end', scope.$index)"
-                  :picker-options="{ start: '08:00', step: '00:15', end: '23:30'}"
+                  :picker-options="{ selectableRange: '00:00:00 - 23:59:59'}"
                   placeholder="选择时间">
-                </el-time-select>
+                </el-time-picker>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">