snow 1 周之前
父節點
當前提交
2fbe54135b

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


二進制
dist/static/css/app.2306ec99.css.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.31d4a785.css


二進制
dist/static/css/app.31d4a785.css.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.64db4233.js


二進制
dist/static/js/app.64db4233.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.f496792b.js


二進制
dist/static/js/app.f496792b.js.gz


+ 65 - 62
src/pages/invData.vue

@@ -1,66 +1,6 @@
 <template>
   <div class="new-report" v-loading="state.loading" style="min-height:300px">
     <div v-if="!state.error && isShow">
-      <div v-loading="dayAccountLoading">
-        <div class="main-title">
-          <p class="title">业务经理开票(每日)</p>
-          <ElDatePicker style="width:135px" placeholder="日期" v-model="dayDate" :clearable="false"
-            @change="requestAccountDay" size="mini" value-format="yyyy-MM-dd" />
-        </div>
-
-        <el-table size="small" border :data="dayAccount">
-          <el-table-column label="用户" prop="uname" width="100px" show-overflow-tooltip />
-
-          <el-table-column label="开票金额" min-width="80px">
-            <template slot-scope="scope">
-              {{ scope.row.dayinfo.inv_fee }}
-            </template>
-          </el-table-column>
-
-          <el-table-column label="开票金额(退)" min-width="100px">
-            <template slot-scope="scope">
-              {{ scope.row.dayinfo.return_inv_fee }}
-            </template>
-          </el-table-column>
-
-          <el-table-column label="成本金额" min-width="80px">
-            <template slot-scope="scope">
-              {{ scope.row.dayinfo.cost_fee }}
-            </template>
-          </el-table-column>
-
-          <el-table-column label="成本金额(退)" min-width="100px">
-            <template slot-scope="scope">
-              {{ scope.row.dayinfo.return_cost_fee }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-
-      <div v-loading="monthLoading" style="margin-top: 10px">
-        <div class="main-title" style="flex-wrap: wrap;">
-          <p class="title">业务经理开票(每月)</p>
-
-          <div style="display: flex;justify-self: end;">
-            <UserSelect :value.sync="monthUser" :year="monthDate" style="margin-right: 10px"
-              @change="requestAccountMonth" @clear="monthAccount = []" />
-
-            <ElDatePicker size="mini" style="width:135px" placeholder="日期" v-model="monthDate" :clearable="false"
-              @change="requestAccountMonth" value-format="yyyy" type="year" />
-          </div>
-        </div>
-
-        <el-table size="small" border :data="monthAccount">
-          <el-table-column label="月份" prop="month" width="100px" show-overflow-tooltip />
-
-          <el-table-column label="开票金额" min-width="80px" prop="month_inv_fee" />
-          <el-table-column label="开票金额(退)" min-width="100px" prop="month_return_inv_fee" />
-
-          <el-table-column label="成本金额" min-width="80px" prop="month_cost_fee" />
-          <el-table-column label="成本金额(退)" min-width="100px" prop="month_return_cost_fee" />
-        </el-table>
-      </div>
-
       <div v-loading="dayCompanyLoading">
         <div class="main-title">
           <p class="title">业务公司开票(每日)</p>
@@ -100,8 +40,6 @@
         </el-table>
       </div>
 
-
-
       <div v-loading="dayCompanyLoading">
         <div class="main-title" style="flex-wrap: wrap;">
           <p class="title">业务公司开票(每月)</p>
@@ -153,6 +91,71 @@
           </el-table-column>
         </el-table>
       </div>
+
+      <div v-loading="dayAccountLoading">
+        <div class="main-title">
+          <p class="title">业务经理开票(每日)</p>
+          <ElDatePicker style="width:135px" placeholder="日期" v-model="dayDate" :clearable="false"
+            @change="requestAccountDay" size="mini" value-format="yyyy-MM-dd" />
+        </div>
+
+        <el-table size="small" border :data="dayAccount">
+          <el-table-column label="用户" prop="uname" width="100px" show-overflow-tooltip />
+
+          <el-table-column label="开票金额" min-width="80px">
+            <template slot-scope="scope">
+              {{ scope.row.dayinfo.inv_fee }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="开票金额(退)" min-width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.dayinfo.return_inv_fee }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="成本金额" min-width="80px">
+            <template slot-scope="scope">
+              {{ scope.row.dayinfo.cost_fee }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="成本金额(退)" min-width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.dayinfo.return_cost_fee }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+      <div v-loading="monthLoading" style="margin-top: 10px">
+        <div class="main-title" style="flex-wrap: wrap;">
+          <p class="title">业务经理开票(每月)</p>
+
+          <div style="display: flex;justify-self: end;">
+            <UserSelect :value.sync="monthUser" :year="monthDate" style="margin-right: 10px"
+              @change="requestAccountMonth" @clear="monthAccount = []" />
+
+            <ElDatePicker size="mini" style="width:135px" placeholder="日期" v-model="monthDate" :clearable="false"
+              @change="requestAccountMonth" value-format="yyyy" type="year" />
+          </div>
+        </div>
+
+        <el-table size="small" border :data="monthAccount">
+          <el-table-column label="月份" prop="month" width="100px" show-overflow-tooltip />
+
+          <el-table-column label="开票金额" min-width="80px" prop="month_inv_fee" />
+          <el-table-column label="开票金额(退)" min-width="100px" prop="month_return_inv_fee" />
+
+          <el-table-column label="成本金额" min-width="80px" prop="month_cost_fee" />
+          <el-table-column label="成本金额(退)" min-width="100px" prop="month_return_cost_fee" />
+        </el-table>
+      </div>
+
+
+
+
+
     </div>
 
     <template v-else-if="!state.loading">

Some files were not shown because too many files changed in this diff