前端

src/api/V2/profitable/index.js

@@ -15,4 +15,10 @@ export const API_GET_LOOKINFO = '/nonContractExpenses/getInfo'
 //审核
 export const API_POST_WORKFLOW_API_HANDLE = '/workflow/api/handle'
 //审核记录
-export const API_POST_AUDITRECORD = '/billOperateHis/query/commonBillOperateHis'
+export const API_POST_AUDITRECORD = '/billOperateHis/query/commonBillOperateHis'
+//仓库
+export const API_GET_WAREHOUSE = '/warehouseBaseInfo/selectWarehouse'
+// 费用管理提交
+export const API_POST_SUBMIT = '/feeDetailsInfo/submit'
+//合同编号下拉
+export const API_GET_WAREHOUSE_NO = '/warehouseBaseInfo/selectContractNoList'

src/lang/zh.js

@@ -1057,7 +1057,25 @@ export default {
     //利润核算
     profitable:'利润核算',
     contractOtherMoney: '合同外费用',
+    contractprofitsdetails:'合同利润  /  利润详情',
+    warehouseprofitsdetails:'库点利润  /  利润详情',
+    expensemanagementdetails:'费用管理  /  费用详情',
+    contractinventory:'合同利润  /  利润详情  /  库存',
+    warehouseinventory:'合同利润  /  利润详情  /  库存',
+    warehousecost:'库点利润  /  利润详情  /  费用',
+    contractcost:'合同利润  /  利润详情  /  费用',
+    cashout:'费用管理  /  费用详情  /  请款',
+    cashoutaduit:'费用管理  /  费用详情  /  审核',
+    payment:'费用管理  /  费用详情  /  付款',
+    receiptaduit:'费用管理  /  费用详情  /  确认',
+    receipt:'费用管理  /  费用详情  /  收款',
+    expenseallot:'费用管理  /  费用详情  /  分配',
+    expenseallotaduit:'费用管理  /  费用详情  /  确认',
+    expensemanagentlook:'费用管理  /  费用详情  /  查看',
     earningsLook: '盈收概览',
+    contractprofits: '合同利润',
+    warehouseprofits: '库点利润',
+    expensemanagement: '费用管理',
     inOutDetailed: '收支明细',
 
     //出库管理

src/model/profitable/index.js

@@ -10,6 +10,12 @@ import {
   API_POST_EDITINFO,
   API_POST_WORKFLOW_API_HANDLE,
   API_POST_AUDITRECORD,
+  API_GET_WAREHOUSE,
+  API_GET_LOOK,
+  API_POST_SUBMIT,
+  API_POST_SHOUGUAN,
+  API_POST_SUBMITPAY,
+  API_GET_WAREHOUSE_NO
 } from '@/api/V2/profitable'
 //收支明细列表
 export const getInOutDetailed = appRx.get(API_GET_INOUTDETAILED, errorCatcher, errorHandle, filter)
@@ -29,3 +35,15 @@ export const getLookInfo = appRx.get(API_GET_LOOKINFO, errorCatcher, errorHandle
 export const woekflowhandle = appRx.post(API_POST_WORKFLOW_API_HANDLE, errorCatcher, errorHandle, filter)
 // 审核记录
 export const getAuditRecord = appRx.get(API_POST_AUDITRECORD, errorCatcher, errorHandle, filter)
+// 审核记录
+export const getwarehouse= appRx.get(API_GET_WAREHOUSE, errorCatcher, errorHandle, filter)
+// 费用管理提交
+export const setexpense = appRx.post(API_POST_SUBMIT, errorCatcher, errorHandle, filter)
+// 合同编号下拉
+export const getcontract = appRx.get(API_GET_WAREHOUSE_NO, errorCatcher, errorHandle, filter)
+// 费用管理提交
+export const expenseLook = appRx.post(API_GET_LOOK, errorCatcher, errorHandle, filter)
+// 费用管理付款确认付款
+export const expensepay= appRx.post(API_POST_SUBMITPAY, errorCatcher, errorHandle, filter)
+// 费用管理编辑 、 收款、付款
+export const expenseshougou= appRx.post(API_POST_SHOUGUAN, errorCatcher, errorHandle, filter)

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -142,6 +142,21 @@
                 <el-button @click="print(1)" v-if="information == '皮重'" type="primary">保存并打印
                 </el-button>
               </div>
+               <!-- <div>
+                      <div>粮源</div>
+                      <div class='stocks' v-for='(item,index) in stocks'>
+                        <el-select v-model="item.warehouseName" filterable placeholder="选择所属仓库" @change="warehouseNameChange" :value="searchType">
+                          <el-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
+                            style="color: #8890b1" />
+                        </el-select>
+                          <ws-input v-model="item.cost" placeholder="输入重量" maxlength="100"
+                          size="small" />
+                          <ws-input v-model="item.cost" placeholder="输入成本" maxlength="100"
+                          size="small" />
+                          <img class='add' @click='addstocks(index)' src="../../../public/img/add.png" alt="">
+                          <img class='del' @click='delstocks(index)' src="../../../public/img/del.png" alt="">
+                      </div>
+                    </div> -->
             </div>
 
           </div>
@@ -437,6 +452,7 @@
         allowEdit: 0,
         mListTop: [],
         mListBottom: [],
+        stocks:[{warehouseName:'',weight:'',cost:''}],
         pListTop: [],
         carList1: [],
         pListBottom: [],
@@ -819,6 +835,12 @@
         }
         // this.deptBudgetTotal = this.carList.length
       },
+      addstocks(index){
+       this.stocks.push({warehouseName:'',cost:''})
+      },
+      delstocks(index){
+        this.stocks.splice(index,1)
+      },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)
         this.pageSize = val
@@ -1685,7 +1707,28 @@
   /deep/.el-pagination {
     margin-bottom: 0;
   }
-
+.stocks{
+  position: relative;
+   /deep/.el-select{
+     width: 30.33%;
+   }
+  /deep/.el-select>.el-input {
+    display: inline-block;
+}
+/deep/>.el-input{
+  width:29.3333%;
+}
+.add,.del{
+  position:absolute;
+  right:16px;
+  transform: translateY(20%);
+  width:20px;
+  height:20px;
+}
+.del{
+  right:-7px;
+}
+}
   .center {
     background: #E8ECF6;
   }

src/views/outboundManagement/weighingManagementNew.vue

@@ -236,6 +236,23 @@
                       <el-button @click="print" v-if="information == '皮重'" type="primary" :disabled="submitAllow">提交
                       </el-button>
                     </div>
+                    <!-- <div>
+                      <div>粮源</div>
+                      <div class='stocks' v-for='(item,index) in stocks'>
+                        <el-select v-model="item.warehouseName" filterable placeholder="选择所属仓库" @change="warehouseNameChange" :value="searchType">
+                          <el-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
+                            style="color: #8890b1" />
+                        </el-select>
+                        <el-select v-model="item.warehouseName" filterable placeholder="选择货名" @change="warehouseNameChange" :value="searchType">
+                          <el-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
+                            style="color: #8890b1" />
+                        </el-select>
+                          <ws-input v-model="item.cost" placeholder="输入重量" maxlength="100"
+                          size="small" />
+                          <img class='add' @click='addstocks(index)' style='width:20px;height:20px;' src="../../../public/img/add.png" alt="">
+                          <img class='del' @click='delstocks(index)' style='width:20px;height:20px;' src="../../../public/img/del.png" alt="">
+                      </div>
+                    </div> -->
                     <!-- </div> -->
                   </div>
                 </div>
@@ -348,6 +365,7 @@
         monitorUrl2: '',
         index: 0,
         inspect: {},
+        stocks:[{warehouseName:'',weight:'',cost:''}],
         id: 0,
         options2: [],
         isSelectType: false,
@@ -445,6 +463,12 @@
     },
     activated() {},
     methods: {
+      addstocks(index){
+       this.stocks.push({warehouseName:'',cost:''})
+      },
+      delstocks(index){
+        this.stocks.splice(index,1)
+      },
       refreshClick(type) {
         let that = this
         if (type == 1) {
@@ -1928,7 +1952,23 @@
     text-align: center;
     margin: 20px auto;
   }
-
+.stocks{
+  position: relative;
+  /deep/.el-select>.el-input {
+    display: inline-block;
+}
+/deep/>.el-input{
+  width:33.3333%;
+}
+.add,.del{
+  position:absolute;
+  right:-16px;
+  transform: translateY(20%);
+}
+.del{
+  right:-40px;
+}
+}
   .butCss {
     opacity: 0;
     color: #000;

src/views/profitable/component/routers/route.js

@@ -27,6 +27,325 @@ const profitableRouter = {
         // module: 'procurement.sparepart.applDetail'
       }
     },  
+    //   // 合同利润
+    //   {
+    //     path: 'contractprofits',
+    //     component: () =>
+    //       import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractprofits'),
+    //     name: 'contractprofits',
+    //     meta: {
+    //       title: 'contractprofits',
+    //       shortcutEntrance: 'profitable',
+    //       module: 'contractManagement.exContract.exContractInfo.view',
+    //       permissicon: [],
+    //       keepAlive: true
+    //       // module: 'procurement.sparepart.applDetail'
+    //     }
+    //   },  
+    //  // 合同利润详情
+    //  {
+    //   path: 'contractprofitsdetails',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractprofitsdetails'),
+    //   name: 'contractprofitsdetails',
+    //   meta: {
+    //     title: 'contractprofitsdetails',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // }, 
+    // // 合同利润库存
+    // {
+    //   path: 'contractinventory',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractinventory'),
+    //   name: 'contractinventory',
+    //   meta: {
+    //     title: 'contractinventory',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // },
+    // // 合同利润费用
+    // {
+    //   path: 'contractcost',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractcost'),
+    //   name: 'contractcost',
+    //   meta: {
+    //     title: 'contractcost',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // },
+    // // 库点利润
+    // {
+    //   path: 'warehouseprofits',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehouseprofits'),
+    //   name: 'warehouseprofits',
+    //   meta: {
+    //     title: 'warehouseprofits',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   }
+    // }, 
+    // // 库点利润详情
+    //  {
+    //   path: 'warehouseprofitsdetails',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehouseprofitsdetails'),
+    //   name: 'warehouseprofitsdetails',
+    //   meta: {
+    //     title: 'warehouseprofitsdetails',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // }, 
+    // // 合同利润库存
+    // {
+    //   path: 'warehouseinventory',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehouseinventory'),
+    //   name: 'warehouseinventory',
+    //   meta: {
+    //     title: 'warehouseinventory',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // },
+    // // 库点利润费用
+    // {
+    //   path: 'warehousecost',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehousecost'),
+    //   name: 'warehousecost',
+    //   meta: {
+    //     title: 'warehousecost',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // }, 
+    // // 费用管理
+    // {
+    //   path: 'expensemanagement',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expensemanagement'),
+    //   name: 'expensemanagement',
+    //   meta: {
+    //     title: 'expensemanagement',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   }
+    // },
+    // // 费用管理详情
+    // {
+    //   path: 'expensemanagementdetails',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expensemanagementdetails'),
+    //   name: 'expensemanagementdetails',
+    //   meta: {
+    //     title: 'expensemanagementdetails',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // }, 
+    // // 费用管理请款
+    // {
+    //   path: 'cashout',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/cashout'),
+    //   name: 'cashout',
+    //   meta: {
+    //     title: 'cashout',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // },
+    // // 费用管理请款审核
+    // {
+    //   path: 'cashoutaduit',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/cashoutaduit'),
+    //   name: 'cashoutaduit',
+    //   meta: {
+    //     title: 'cashoutaduit',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // },  
+    // // 费用管理收款
+    // {
+    //   path: 'receipt',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/receipt'),
+    //   name: 'receipt',
+    //   meta: {
+    //     title: 'receipt',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // }, 
+    
+    // // 费用管理收款确认
+    // {
+    //   path: 'receiptaduit',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/receiptaduit'),
+    //   name: 'receiptaduit',
+    //   meta: {
+    //     title: 'receiptaduit',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // },
+    // // 费用管理收款
+    // {
+    //   path: 'receipt',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/receipt'),
+    //   name: 'receipt',
+    //   meta: {
+    //     title: 'receipt',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // }, 
+    
+    // // 费用管理收款确认
+    // {
+    //   path: 'receiptaduit',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/receiptaduit'),
+    //   name: 'receiptaduit',
+    //   meta: {
+    //     title: 'receiptaduit',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // }, 
+    // // 费用管理付款
+    // {
+    //   path: 'payment',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/payment'),
+    //   name: 'payment',
+    //   meta: {
+    //     title: 'payment',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // }, 
+    // // 费用管理费用分配
+    // {
+    //   path: 'expenseallot',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expenseallot'),
+    //   name: 'expenseallot',
+    //   meta: {
+    //     title: 'expenseallot',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // }, 
+    // // 费用管理费用分配确认
+    // {
+    //   path: 'expenseallotaduit',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expenseallotaduit'),
+    //   name: 'expenseallotaduit',
+    //   meta: {
+    //     title: 'expenseallotaduit',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // }, 
+    // // 费用管理查看
+    // {
+    //   path: 'expensemanagentlook',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expensemanagentlook'),
+    //   name: 'expensemanagentlook',
+    //   meta: {
+    //     title: 'expensemanagentlook',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'contractManagement.exContract.exContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // }, 
       // 收支明细
       {
         path: 'inOutDetailed',