snow 1 年間 前
コミット
d30fd364e3

ファイルの差分が大きいため隠しています
+ 0 - 0
dist/index.html


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/static/css/app.0cb97c91.css


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/static/js/app.a0d8f071.js


BIN
dist/static/js/app.a0d8f071.js.gz


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/static/js/app.ef053dde.js


BIN
dist/static/js/app.ef053dde.js.gz


BIN
dist/welcome.jpg


BIN
public/welcome.jpg


+ 1 - 1
src/components/newReport/src/PurchaseBack.vue

@@ -7,7 +7,7 @@
       participation:'--'
     }]" size="mini" border>
       <el-table-column label="采购员" prop="creater" width="120px" />
-      <el-table-column label="采购部门" prop="name" width="120px" />
+      <!-- <el-table-column label="采购部门" prop="name" width="120px" /> -->
       <el-table-column label="反馈单数" prop="num" />
       <el-table-column label="竞价参与度" prop="participation" width="120px">
         <template slot-scope="scope">

+ 1 - 1
src/components/newReport/src/purchase.vue

@@ -2,7 +2,7 @@
   <div class="SalesReportRejectedNew" v-loading="loading">
     <el-table :data="tableData" size="mini" border>
       <el-table-column label="采购员" prop="cgder" width="110px" />
-      <el-table-column label="采购部门" prop="name" width="120px" />
+      <!-- <el-table-column label="采购部门" prop="name" width="120px" /> -->
       <el-table-column width="110px" label="采购单总量" prop="total_cgd" />
       <el-table-column label="库存品" prop="tag_1" />
       <el-table-column label="非库存品" prop="tag_2" />

+ 2 - 3
src/components/newReport/src/sendExp.vue

@@ -1,9 +1,8 @@
 <template>
   <div class="SalesReportRejectedNew" v-loading="loading">
     <el-table :data="tableData" size="mini" border :span-method="objectSpanMethod">
-      <el-table-column label="计数项:发货单编号">
-        <el-table-column width="140px" label="部门" prop="name" />
-      </el-table-column>
+      <el-table-column width="70px" label="部门" prop="name" />
+
       <el-table-column width="140px" show-overflow-tooltip label="仓库负责人" prop="0" />
       
       <el-table-column label="时效" align="center">

+ 1 - 2
src/components/newReport/src/sendOrder.vue

@@ -1,8 +1,7 @@
 <template>
   <div class="SalesReportRejectedNew" v-loading="loading">
     <el-table :data="tableData" size="mini" border :span-method="objectSpanMethod">
-      <el-table-column label="计数项:发货工单号">
-        <el-table-column  width="140"  label="部门" prop="name" />
+      <el-table-column label="部门" width="70"   prop="name">
       </el-table-column>
       <el-table-column width="140px" label="仓库负责人"  prop="0"  />
       <el-table-column label="时效" align="center">

+ 8 - 8
src/components/newReport/src/theSales.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="SalesReportRejectedNew" v-loading="loading">
-    <el-table :data="tableData" size="mini" border max-height="300px">
-      <el-table-column label="产品编码" prop="good_code" width="160px" />
+    <el-table :data="tableData" size="mini" border>
+      <el-table-column label="产品编码" prop="good_code" width="160px" show-overflow-tooltip />
       <el-table-column label="产品名称" prop="good_name" min-width="160px" show-overflow-tooltip />
-      <el-table-column label="当日库存销售" prop="good_num" min-width="160px" show-overflow-tooltip />
-      <el-table-column label="当日库存发货" prop="send_num" width="100px" />
-      <el-table-column label="当前剩余可用库存" prop="stock_num" width="120px" />
-      <el-table-column label="业务公司名称" prop="supplierName" width="190px" />
-      <el-table-column label="库存采购单" prop="good_price" width="90px" />
-      <el-table-column label="当前库存消耗金额" prop="total_fee" width="130px" />
+      <el-table-column label="当日库存销售" prop="good_num" width="120px" show-overflow-tooltip />
+      <el-table-column label="当日库存发货" prop="send_num" width="100px" show-overflow-tooltip/>
+      <el-table-column label="当前剩余可用库存" prop="stock_num" width="120px" show-overflow-tooltip/>
+      <el-table-column label="业务公司名称" prop="supplierName" min-width="190px" show-overflow-tooltip/>
+      <el-table-column label="库存采购单" prop="good_price" width="90px" show-overflow-tooltip/>
+      <el-table-column label="当前库存消耗金额" prop="total_fee" width="130px" show-overflow-tooltip />
     </el-table>
   </div>
 </template>

+ 9 - 7
src/pages/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="container">
-    <h3 style="text-align: center;">数据导航</h3>
+    <h3 style="text-align: center;color:#ffffff;margin-bottom: 40px;">数据导航</h3>
 
     <div class="wrapper" v-for="route in routes" :key="route.label">
-      <el-button type="primary" @click="goRouter($event,route.link)">{{route.label}}
+      <el-button type="info" plain @click="goRouter($event,route.link)">{{route.label}}
         <i class="el-icon-right"></i>
       </el-button>
     </div>
@@ -36,12 +36,14 @@ export default {
 
 <style lang="scss">
 .container {
-  background: #E4E5E6;
-
-width:100%;
-height: 100vh;
-position: fixed;
+  width:100%;
+  height: 100vh;
+  position: fixed;
+  background-image: url(/welcome.jpg);
+  background-size: cover;
+  background-position: 35%;
 }
+
 .wrapper{
   display: flex;
   padding: 10px;

+ 21 - 18
src/pages/newReport.vue

@@ -12,8 +12,8 @@
         </el-col>
 
         <el-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16">
-          <p class="title">2.订单情况 </p>
-          <order :date="date" />
+          <p class="title">2.订单未发货情况</p>
+          <not-deliver-good :date="date" />
         </el-col>
       </el-row>
 
@@ -24,44 +24,47 @@
         </el-col>
 
         <el-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16">
-          <p class="title">4.采购员采购单情况</p>
-          <purchase :date="date" />
+          <p class="title">4.单情况</p>
+          <order :date="date" />
         </el-col>
       </el-row>
 
       <el-row :gutter="20">
-        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <p class="title">5.采购员竞价反馈情况 : 竞价单总量 : {{ zxTotal }}</p>
+        <el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
+          <p class="title">5.竞价单空返情况统计:</p>
+          <empty-return :date="date" />
+        </el-col>
+        <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6">
+          <p class="title">6.采购员竞价反馈情况 : 竞价单总量 : {{ zxTotal }}</p>
           <purchase-back :date="date" @getZXTotal="getZXTotal" />
         </el-col>
 
-        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <p class="title">6.竞价单空返情况统计:</p>
-          <empty-return :date="date" />
+        <el-col :xs="24" :sm="10" :md="10" :lg="10" :xl="10">
+          <p class="title">7.采购员采购单情况</p>
+          <purchase :date="date" />
         </el-col>
       </el-row>
 
       <el-row :gutter="20">
-        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <p class="title">7.当日库存销售情况表:</p>
-          <the-sales :date="date" />
-        </el-col>
+        <!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+
+        </el-col> -->
 
         <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
           <p class="title">8.发货工单时效:</p>
           <send-order :date="date" />
         </el-col>
-      </el-row>
 
-      <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
           <p class="title">9.发货单时效:</p>
           <send-exp :date="date" />
         </el-col>
+      </el-row>
 
-        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <p class="title">10.订单未发货情况:</p>
-          <not-deliver-good :date="date" />
+      <el-row :gutter="20">
+        <el-col :xs="24">
+          <p class="title">10.当日库存销售情况表:</p>
+          <the-sales :date="date" />
         </el-col>
       </el-row>
     </div>

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません