Browse Source

发票总价

gHost 1 year ago
parent
commit
ea5b7dfa19
100 changed files with 205 additions and 205 deletions
  1. 9 11
      components/drawer/invoice/user_settlement.vue
  2. 6 4
      components/list/user_settlement_cw.vue
  3. 2 2
      dist/200.html
  4. 1 1
      dist/_nuxt/1fadefb.js
  5. 1 1
      dist/_nuxt/531b8a1.js
  6. 1 1
      dist/_nuxt/9ab11a0.js
  7. 1 1
      dist/_nuxt/css/977a706.css
  8. 2 2
      dist/index.html
  9. 2 2
      dist/login/index.html
  10. 2 2
      dist/main/404/index.html
  11. 2 2
      dist/main/account_manager/index.html
  12. 2 2
      dist/main/add/category_create/index.html
  13. 2 2
      dist/main/add/task_create/index.html
  14. 2 2
      dist/main/add/task_info/index.html
  15. 2 2
      dist/main/add/task_log/index.html
  16. 2 2
      dist/main/admin_user/index.html
  17. 2 2
      dist/main/artificial_order/index.html
  18. 2 2
      dist/main/artificial_orders/index.html
  19. 2 2
      dist/main/artificial_payment_add/index.html
  20. 2 2
      dist/main/balance_change/index.html
  21. 2 2
      dist/main/cancel_account/index.html
  22. 2 2
      dist/main/card_conf/index.html
  23. 2 2
      dist/main/cash_form/index.html
  24. 2 2
      dist/main/category/index.html
  25. 2 2
      dist/main/cats/index.html
  26. 2 2
      dist/main/cert_check/index.html
  27. 2 2
      dist/main/cert_count/index.html
  28. 2 2
      dist/main/cert_edit/index.html
  29. 2 2
      dist/main/cert_pro/index.html
  30. 2 2
      dist/main/chat_users/index.html
  31. 2 2
      dist/main/cloud_balance/index.html
  32. 2 2
      dist/main/cloud_developer/index.html
  33. 2 2
      dist/main/cloud_job/index.html
  34. 2 2
      dist/main/company_vip/index.html
  35. 2 2
      dist/main/cps_manage/index.html
  36. 2 2
      dist/main/cunxinbao/index.html
  37. 2 2
      dist/main/data/index.html
  38. 2 2
      dist/main/data_sc/index.html
  39. 2 2
      dist/main/dev_check/index.html
  40. 2 2
      dist/main/dev_check_detail/index.html
  41. 2 2
      dist/main/dev_show/index.html
  42. 2 2
      dist/main/dynamic/index.html
  43. 2 2
      dist/main/dynamic_comment/index.html
  44. 2 2
      dist/main/dynamic_type/index.html
  45. 2 2
      dist/main/education/index.html
  46. 2 2
      dist/main/experience/index.html
  47. 2 2
      dist/main/free_work/index.html
  48. 2 2
      dist/main/freework_level/index.html
  49. 2 2
      dist/main/freework_level_info/index.html
  50. 2 2
      dist/main/gongmall/index.html
  51. 2 2
      dist/main/group/index.html
  52. 2 2
      dist/main/group_list/index.html
  53. 2 2
      dist/main/index.html
  54. 2 2
      dist/main/invoice/index.html
  55. 2 2
      dist/main/invoice_audit/index.html
  56. 2 2
      dist/main/jishuquan/index.html
  57. 2 2
      dist/main/job/index.html
  58. 2 2
      dist/main/jobs/index.html
  59. 2 2
      dist/main/jobs_behalf_post/index.html
  60. 2 2
      dist/main/jobs_publish_company/index.html
  61. 2 2
      dist/main/js/admin_user/index.html
  62. 2 2
      dist/main/js/group/index.html
  63. 2 2
      dist/main/js/nav_list/index.html
  64. 2 2
      dist/main/js/sale/index.html
  65. 2 2
      dist/main/js/sale_order/index.html
  66. 2 2
      dist/main/js/special_list/index.html
  67. 2 2
      dist/main/js/user_bank_order/index.html
  68. 2 2
      dist/main/js/user_workfile_list/index.html
  69. 2 2
      dist/main/kaifabao/index.html
  70. 2 2
      dist/main/kaifawu_contact/index.html
  71. 2 2
      dist/main/nav_add/index.html
  72. 2 2
      dist/main/nav_list/index.html
  73. 2 2
      dist/main/occupation_setting/index.html
  74. 2 2
      dist/main/orders/index.html
  75. 2 2
      dist/main/orders_detail/index.html
  76. 2 2
      dist/main/orders_frozen/index.html
  77. 2 2
      dist/main/outsource_bill/index.html
  78. 2 2
      dist/main/page_item/index.html
  79. 2 2
      dist/main/page_manage/index.html
  80. 2 2
      dist/main/persona/index.html
  81. 2 2
      dist/main/present_job_apply/index.html
  82. 2 2
      dist/main/project_form/index.html
  83. 2 2
      dist/main/publish_present/index.html
  84. 2 2
      dist/main/publish_recruit/index.html
  85. 2 2
      dist/main/qingtuanbao/index.html
  86. 2 2
      dist/main/quick_manage/index.html
  87. 2 2
      dist/main/recruit_manage/index.html
  88. 2 2
      dist/main/recuit_purchase_conf/index.html
  89. 2 2
      dist/main/remark_list/index.html
  90. 2 2
      dist/main/report_business/index.html
  91. 2 2
      dist/main/report_cash/index.html
  92. 2 2
      dist/main/sale/index.html
  93. 2 2
      dist/main/sale_detail/index.html
  94. 2 2
      dist/main/sale_order/index.html
  95. 2 2
      dist/main/sale_vod_edit/index.html
  96. 2 2
      dist/main/sale_vod_manage/index.html
  97. 2 2
      dist/main/sale_vod_publish/index.html
  98. 2 2
      dist/main/send/index.html
  99. 2 2
      dist/main/send_add/index.html
  100. 0 0
      dist/main/solution/index.html

+ 9 - 11
components/drawer/invoice/user_settlement.vue

@@ -1,6 +1,6 @@
 <template>
   <el-drawer
-    title="关联订单"
+    :title="`关联订单(发票总价:¥${fp_info.money})`"
     size="60%"
     :append-to-body="false"
     :destroy-on-close="true"
@@ -10,37 +10,32 @@
     :wrapperClosable="false"
     ref="drawer_close">
     <div v-loading="loading" style="padding: 20px"  class="block">
-      <el-table row-key="id" :data="list">
+      <el-table row-key="id"  show-summary :data="list">
         <el-table-column prop="title" label="关联项目">
           <template slot-scope="scope">
             <a :href="scope.row.link" style="color: #006eff" target="_blank">{{scope.row.title}}</a>
           </template>
         </el-table-column>
-        <el-table-column prop="money" label="应付金额">
+        <el-table-column prop="y_money" sortable label="应付金额">
           <template slot-scope="scope">
             <span>{{scope.row.y_money}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="sf_money" label="实付金额">
+        <el-table-column prop="sf_money" sortable label="实付金额">
           <template slot-scope="scope">
             <span>{{scope.row.sf_money}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="sf_money" label="结算费率">
+        <el-table-column prop="title" label="结算费率">
           <template slot-scope="scope">
             <span>{{scope.row.js_rate}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="status" label="开票类型">
+        <el-table-column prop="title" label="开票类型">
           <template slot-scope="scope">
             <span>{{scope.row.invoice_type_text}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="status" label="订单状态">
-          <template slot-scope="scope">
-            <span>{{scope.row.status_text}}</span>
-          </template>
-        </el-table-column>
       </el-table>
     </div>
   </el-drawer>
@@ -56,6 +51,9 @@
       back:{
         type:Object
       },
+      fp_info:{
+        type:Object
+      }
     },
     data() {
       return {

+ 6 - 4
components/list/user_settlement_cw.vue

@@ -41,7 +41,7 @@
             <span>{{scope.row.y_money}}</span>
             <br/>
             <a v-if="scope.row.user_invoice.id" target="_blank" :href="scope.row.user_invoice.file">查看发票</a>
-            <span v-if="scope.row.user_invoice.order_num>0" @click="show_user_settlement(scope.row.user_invoice.id)" style="color: red;cursor: pointer;"> <br/>关联了{{scope.row.user_invoice.order_num}}个订单</span>
+            <span v-if="scope.row.user_invoice.order_num>0" @click="show_user_settlement(scope.row.user_invoice)" style="color: red;cursor: pointer;"> <br/>关联了{{scope.row.user_invoice.order_num}}个订单</span>
           </template>
         </el-table-column>
         <el-table-column prop="is_income" width="140px" label="实付金额">
@@ -113,7 +113,7 @@
     </el-pagination>
 
     <pub_log v-if="drawer_obj.pub_log" :back="this" :pro="drawer_obj.id" action="user_settlement"></pub_log>
-    <user_settlement v-if="drawer_obj.user_settlement" :back="this" :pro="drawer_obj.id"></user_settlement>
+    <user_settlement v-if="drawer_obj.user_settlement" :fp_info="drawer_obj.obj" :back="this" :pro="drawer_obj.id"></user_settlement>
     <config v-if="drawer_obj.config" :back="this" :pro="drawer_obj.id"></config>
   </div>
 </template>
@@ -139,6 +139,7 @@
           id:0,
           pub_log:false,
           config:false,
+          obj:{},
         },
         search: {
           pagesize: 15,
@@ -188,9 +189,10 @@
         this.drawer_obj.id = id;
         this.drawer_obj.pub_log = true;
       },
-      show_user_settlement(id)
+      show_user_settlement(row)
       {
-        this.drawer_obj.id = id;
+        this.drawer_obj.obj=row;
+        this.drawer_obj.id = row.id;
         this.drawer_obj.user_settlement = true;
       },
       show_user_invoice_add(id)

File diff suppressed because it is too large
+ 2 - 2
dist/200.html


+ 1 - 1
dist/_nuxt/1fadefb.js

@@ -1 +1 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[109],{805:function(t,e,n){"use strict";n.r(e);var o={props:[],components:{user_settlement_cw:n(562).a},data:function(){return{invoice_type:[1,2]}},computed:{}},c=n(4),component=Object(c.a)(o,(function(){return(0,this._self._c)("user_settlement_cw",{attrs:{invoice_type:this.invoice_type,role:1,status:0}})}),[],!1,null,null,null);e.default=component.exports}}]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([[109],{805:function(t,e,n){"use strict";n.r(e);var o={props:[],components:{user_settlement_cw:n(562).a},data:function(){return{invoice_type:[1,2]}},computed:{}},c=n(4),component=Object(c.a)(o,(function(){return(0,this._self._c)("user_settlement_cw",{attrs:{invoice_type:this.invoice_type,role:1,status:2}})}),[],!1,null,null,null);e.default=component.exports}}]);

File diff suppressed because it is too large
+ 1 - 1
dist/_nuxt/531b8a1.js


File diff suppressed because it is too large
+ 1 - 1
dist/_nuxt/9ab11a0.js


File diff suppressed because it is too large
+ 1 - 1
dist/_nuxt/css/977a706.css


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


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


File diff suppressed because it is too large
+ 2 - 2
dist/main/404/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/account_manager/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/add/category_create/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/add/task_create/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/add/task_info/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/add/task_log/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/admin_user/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/artificial_order/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/artificial_orders/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/artificial_payment_add/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/balance_change/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cancel_account/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/card_conf/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cash_form/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/category/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cats/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cert_check/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cert_count/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cert_edit/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cert_pro/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/chat_users/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cloud_balance/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cloud_developer/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cloud_job/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/company_vip/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cps_manage/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cunxinbao/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/data/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/data_sc/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/dev_check/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/dev_check_detail/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/dev_show/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/dynamic/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/dynamic_comment/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/dynamic_type/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/education/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/experience/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/free_work/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/freework_level/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/freework_level_info/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/gongmall/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/group/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/group_list/index.html


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


File diff suppressed because it is too large
+ 2 - 2
dist/main/invoice/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/invoice_audit/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/jishuquan/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/job/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/jobs/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/jobs_behalf_post/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/jobs_publish_company/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/js/admin_user/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/js/group/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/js/nav_list/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/js/sale/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/js/sale_order/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/js/special_list/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/js/user_bank_order/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/js/user_workfile_list/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/kaifabao/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/kaifawu_contact/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/nav_add/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/nav_list/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/occupation_setting/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/orders/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/orders_detail/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/orders_frozen/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/outsource_bill/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/page_item/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/page_manage/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/persona/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/present_job_apply/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/project_form/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/publish_present/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/publish_recruit/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/qingtuanbao/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/quick_manage/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/recruit_manage/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/recuit_purchase_conf/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/remark_list/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/report_business/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/report_cash/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/sale/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/sale_detail/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/sale_order/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/sale_vod_edit/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/sale_vod_manage/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/sale_vod_publish/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/send/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/send_add/index.html


+ 0 - 0
dist/main/solution/index.html


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