xiaozhen 6 лет назад
Родитель
Сommit
54b5887f68

+ 0 - 0
dist/.nojekyll


+ 0 - 101
dist/_nuxt/LICENSES

@@ -1,101 +0,0 @@
-/*!
- * Vue.js v2.6.10
- * (c) 2014-2019 Evan You
- * Released under the MIT License.
- */
-
-/**
- * vuex v3.1.1
- * (c) 2019 Evan You
- * @license MIT
- */
-
-/*!
- * JavaScript Cookie v2.2.0
- * https://github.com/js-cookie/js-cookie
- *
- * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
- * Released under the MIT license
- */
-
-/*!
-  * vue-router v3.0.6
-  * (c) 2019 Evan You
-  * @license MIT
-  */
-
-/**
- * vue-meta v1.6.0
- * (c) 2019 Declan de Wet & Sébastien Chopin (@Atinux)
- * @license MIT
- */
-
-/*
-	object-assign
-	(c) Sindre Sorhus
-	@license MIT
-	*/
-
-/*!
- * Determine if an object is a Buffer
- *
- * @author   Feross Aboukhadijeh <https://feross.org>
- * @license  MIT
- */
-
-/*!
-* screenfull
-* v4.2.1 - 2019-07-27
-* (c) Sindre Sorhus; MIT License
-*/
-
-/*!
- * vue-no-ssr v1.1.1
- * (c) 2018-present egoist <0x142857@gmail.com>
- * Released under the MIT License.
- */
-
-/*!
- * Fuse.js v3.4.5 - Lightweight fuzzy-search (http://fusejs.io)
- * 
- * Copyright (c) 2012-2017 Kirollos Risk (http://kiro.me)
- * All Rights Reserved. Apache Software License 2.0
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- */
-
-/*!
- * The buffer module from node.js, for the browser.
- *
- * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
- * @license  MIT
- */
-
-/*!
- * Quill Editor v1.2.3
- * https://quilljs.com/
- * Copyright (c) 2014, Jason Chen
- * Copyright (c) 2013, salesforce.com
- */
-
-/**
- * Checks if an event is supported in the current execution environment.
- *
- * NOTE: This will not work correctly for non-generic events such as `change`,
- * `reset`, `load`, `error`, and `select`.
- *
- * Borrows from Modernizr.
- *
- * @param {string} eventNameSuffix Event name, e.g. "click".
- * @param {?boolean} capture Check if the capture phase is supported.
- * @return {boolean} True if the event is supported.
- * @internal
- * @license Modernizr 3.0.0pre (Custom Build) | MIT
- */
-
-/*!
- * Quill Editor v1.3.6
- * https://quilljs.com/
- * Copyright (c) 2014, Jason Chen
- * Copyright (c) 2013, salesforce.com
- */

BIN
dist/_nuxt/fonts/535877f.woff


BIN
dist/_nuxt/fonts/732389d.ttf


BIN
dist/favicon.ico


+ 259 - 80
pages/main/index/user_bills.vue

@@ -1,80 +1,259 @@
-<template>
-  <div>
-    <div class="user-name">用户:开发者大汪(123132)</div>
-    <div class="user-info">订单数量:100(支付成功 50),收入金额:123.45元(成功 34.45元),支出金额:543.21元(成功 43.21元),当前余额 1000.00元</div>
-    <el-table
-      :data="tableData" border
-      style="width: 100%">
-      <el-table-column
-        prop=""
-        label="订单名称">
-      </el-table-column>
-      <el-table-column
-        prop=""
-        label="实际金额">
-      </el-table-column>
-      <el-table-column
-        prop=""
-        label="当前余额">
-      </el-table-column>
-      <el-table-column
-        prop=""
-        label="支付方式">
-      </el-table-column>
-      <el-table-column
-        prop=""
-        label="订单状态">
-      </el-table-column>
-      <el-table-column
-        prop=""
-        label="创建时间">
-      </el-table-column>
-      <el-table-column
-        prop=""
-        label="订单编号">
-      </el-table-column>
-      <el-table-column
-        prop=""
-        label="人工">
-      </el-table-column>
-      <el-table-column
-        prop=""
-        label="备注说明">
-      </el-table-column>
-    </el-table>
-    <div class="order-footer">
-      <el-pagination
-        background
-        @current-change="getTableData"
-        @size-change="changePageSize"
-        :current-page.sync="currentPage"
-        :page-sizes="[10, 20, 30, 40]"
-        :page-size="20"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="totalCount"
-      ></el-pagination>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  
-}
-</script>
-
-<style lang="scss" scoped>
-  .user-name {
-    margin-bottom: 10px;
-  }
-
-  .user-info {
-    margin-bottom: 10px;
-  }
-
-  .order-footer {
-    position: absolute;
-    bottom: 10px;
-    left: 10px;
-  }
-</style>
+<template>
+  <div>
+    <div>
+    <div class="user-name">用户:开发者大汪(123132)</div>
+    <div class="user-info">订单数量:100(支付成功 50),收入金额:123.45元(成功 34.45元),支出金额:543.21元(成功 43.21元),当前余额 1000.00元</div>
+    <el-table
+      :data="finaceList" border
+      style="width: 100%">
+      <el-table-column
+        prop=""
+        label="订单名称">
+        <template slot-scope="scope">
+          <a href="" class="link-type product_title">{{scope.row.product_title}}</a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop=""
+        label="实际金额">
+        <template slot-scope="scope">
+          {{scope.row.real_amount}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop=""
+        label="当前余额">
+        <template slot-scope="scope">
+          {{scope.row.total_balance?scope.row.total_balance:'--'}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop=""
+        label="支付方式">
+        <template slot-scope="scope">
+          {{scope.row.channel_name}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop=""
+        label="订单状态">
+        <template slot-scope="scope">
+          {{scope.row.order_state_name}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop=""
+        label="创建时间">
+        <template slot-scope="scope">
+          {{scope.row.created_at_name}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop=""
+        label="订单编号">
+        <template slot-scope="scope">
+          {{scope.row.order_no}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop=""
+        label="人工">
+        <template slot-scope="scope">
+          {{scope.row.artificial_mark?'是':'否'}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop=""
+        label="备注说明">
+        <template slot-scope="scope">
+        {{scope.row.public_comment}}
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+    <div class="order-footer">
+      <el-pagination
+        background
+        @current-change="getFinanceList"
+        @size-change="changePageSize"
+        :current-page.sync="currentPage"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="20"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="totalCount"
+      ></el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        tradeList: [
+          {
+            id: 0,
+            type: "全部"
+          },
+          {
+            id: 1,
+            type: "充值"
+          },
+          {
+            id: 2,
+            type: "提现"
+          },
+          {
+            id: 3,
+            type: "购买"
+          },
+          {
+            id: 4,
+            type: "购买"
+          }
+        ],
+
+        finaceList: [],
+
+        // 下发的总数据
+        totalData: {},
+        // 项目ID
+        jobID: "",
+        // 审核人
+        period: "",
+        status: "",
+
+        // 负责人
+        checkUser: "",
+        // 审核人列表
+        periodStatusList: [],
+        // 数据总条目
+        totalCount: 1,
+        currentPage: 1,
+        currentPageSize: 20,
+        // 列表数据
+        tableData: [],
+        localData: {
+          env: "test"
+        }
+      };
+    },
+    computed: {
+      isTest() {
+        return this.localData.env === "test";
+      }
+    },
+    mounted() {
+      // this.getTableData();
+      this.getFinanceList();
+    },
+    methods: {
+      clickDev(uid) {
+        this.$router.push({ path: "/main/orders_detail", params: { id: uid } });
+      },
+      changePageSize(val) {
+        this.getFinanceList();
+      },
+      // 格式化列表数据
+      formatTableData(data) {
+        return data.map(i => ({
+          ...i,
+          payAround: `${i.start_time}<br>${i.end_time}`,
+          pre_send_salary_timeShow: new Date(
+            i.pre_send_salary_time * 1000
+          ).toLocaleDateString()
+        }));
+      },
+      formatDate(time) {
+        var now = new Date(time * 1000);
+        var year = now.getFullYear();
+        var month = now.getMonth() + 1;
+        var date = now.getDate();
+        var hour = now.getHours();
+        var minute = now.getMinutes();
+        var second = now.getSeconds();
+        if (hour < 10) {
+          hour = "0" + hour;
+        }
+        if (minute < 10) {
+          minute = "0" + minute;
+        }
+        if (second < 10) {
+          second = "0" + second;
+        }
+        return (
+          year +
+          "-" +
+          month +
+          "-" +
+          date +
+          " " +
+          hour +
+          ":" +
+          minute +
+          ":" +
+          second
+        );
+      },
+
+      // 获取列表数据
+
+      async getFinanceList() {
+        let body = {
+          page: this.currentPage,
+          page_size: this.currentPageSize,
+
+        };
+        const res = await this.$post("/api/admin/order/get_user_orders", body);
+        var data = res.data;
+        this.finaceList = data.orders;
+        this.totalCount = Number(data.count);
+      },
+      async downFinanceList() {
+        let body = {
+          page: this.currentPage,
+          page_size: this.currentPageSize,
+          user:this.$route.query.uid
+        };
+        // const res = await this.$get("/api/admin/order/get_orders", body);
+        // http://local-rooter.proginn.com:20201/api/admin/order/get_orders?page=1&page_size=20&artificial_mark=1
+        var url =
+          window.location.host + "/api/admin/order/export?" + "artificial_mark=1";
+        console.log(url);
+        window.location.href = "http://" + url;
+      },
+      createOrder() {
+        this.$router.push({
+          path: "artificial_order/",
+          query: {
+            type: "create"
+          }
+        });
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .user-name {
+    margin-bottom: 10px;
+  }
+
+  .user-info {
+    margin-bottom: 10px;
+  }
+
+  .order-footer {
+    position: absolute;
+    bottom: 10px;
+    left: 10px;
+  }
+
+  .product_title{
+    overflow: hidden;
+    -webkit-line-clamp: 1;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+  }
+</style>

+ 31 - 18
pages/main/index/work_bill.vue

@@ -1,28 +1,28 @@
 <template>
-  <div>
+  <div v-if="bill">
     <el-card class="box-card">
       <div slot="header" class="header clearfix">
         <span>工资账单明细</span>
       </div>
       <el-row :gutter="20">
         <el-col :span="12">
-          <div class="module-title">企业方 需求方大汪(12313)</div>
+          <div class="module-title">企业方 {{bill.enterprise.nickname}}({{bill.enterprise.uid}})</div>
           <div class="module-content">
-            <div>实际费用:¥1070.00</div>
-            <div>开发款项:¥1000.00</div>
-            <div>平台服务费:¥70.00</div>
-            <div>应缴税费:¥0</div>
-            <div>直通车抵扣:¥0</div>
+            <div>实际费用:¥{{bill.order.real_amount/100}}</div>
+            <div>开发款项:¥{{bill.hire.price}}</div>
+            <div>平台服务费:¥{{bill.hire.service_fee}}</div>
+            <div>应缴税费:¥{{bill.hire.tax_fee}}</div>
+            <div>直通车抵扣:¥{{bill.hire.fast_hire_fee}}</div>
             <div>托管金额:¥2140.00</div>
             <div>差价:¥1070.00(含税¥70.00)</div>
             <div>退款:¥0(含税¥70.00)</div>
           </div>
         </el-col>
         <el-col :span="12">
-          <div class="module-title">开发者 开发者大汪(4534)</div>
+          <div class="module-title">{{bill.developer.nickname}}({{bill.developer.uid}})</div>
           <div class="module-content">
-            <div>实际费用:¥1000.00</div>
-            <div>开发款项:¥1000.00</div>
+            <div>实际费用:{{bill.hire.price}}</div>
+            <div>开发款项:¥{{bill.hire.price}}</div>
             <div>平台服务费:¥0</div>
             <div>应交税费:¥0</div>
           </div>
@@ -32,9 +32,9 @@
         <el-col :span="24">
           <div class="module-title">工资明细</div>
           <div class="module-content">
-            <div>工作日薪:¥300/天</div>
-            <div>工作周期:2019/09/24 至 2019/09/25(10小时)</div>
-            <div>正式工资:¥1000.00(10小时)</div>
+            <div>工作日薪:¥{{bill.hire.daily_price}}/天</div>
+            <div>工作周期:{{bill.hire.start_date}} 至 {{bill.hire.end_date}}(10小时)</div>
+            <div>正式工资:¥{{bill.hire.daily_price}}(10小时)</div>
           </div>
         </el-col>
       </el-row>
@@ -42,11 +42,11 @@
         <el-col :span="24">
           <div class="module-title">账单信息</div>
           <div class="module-content">
-            <div>创建时间:2019/09/24  15:04:20</div>
-            <div>托管时间:2019/09/24  15:05:20</div>
+            <div>创建时间:{{bill.hire.create_time}}</div>
+            <div>托管时间:{{bill.hire.pay_time}}</div>
             <div>结薪时间:2019/09/24  15:05:20</div>
             <div>关联订单:雇佣款_1231  雇佣补差价_1231</div>
-            <div>费率明细:企业方:实际服务费率7.00%;</div>
+            <div>费率明细:企业方:实际服务费率{{Number(100*(bill.hire.service_fee/bill.hire.price))}}%;</div>
           </div>
         </el-col>
       </el-row>
@@ -56,7 +56,20 @@
 
 <script>
 export default {
-  
+  data(){
+    return {
+      bill:null
+    }
+  },
+  mounted(){
+    this.getBill();
+  },
+  methods:{
+    async getBill(){
+      const data=await this.$post("/api/admin/hire/detail", { id: this.$route.query.id })
+      this.bill=data.data;
+    }
+  }
 }
 </script>
 
@@ -95,4 +108,4 @@ export default {
   margin-top: 17px;
   margin-left: 14px;
 }
-</style>
+</style>