贸易服务管理添加样式

src/api/V2/tradeServicesManagement/index.js

@@ -1,5 +1,6 @@
-//仓库列表查看
-export const API_GET_WAREHOUSE_LOOK = '/warehouseBaseInfo/getWarehouse'
+//贸易服务管理
+// 列表
+export const API_GET_TRADESERVICES_LIST  = '/tradeWarehouseReceiptAppl/selectTradeWarehouseReceiptAppl'
 
 
 

src/model/tradeServicesManagement/index.js

@@ -1,8 +1,8 @@
 import { errorCatcher, errorHandle, filter } from 'base-core-lib'
 import { appRx } from '../defalutConfig/indexRx'
 import {
-    API_GET_WAREHOUSE_BASEINFO
+    API_GET_TRADESERVICES_LIST
 } from '@/api/V2/tradeServicesManagement'
 
 // 列表
-export const getList = appRx.get(API_GET_WAREHOUSE_BASEINFO, errorCatcher, errorHandle, filter)
+export const getList = appRx.get(API_GET_TRADESERVICES_LIST, errorCatcher, errorHandle, filter)

src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

@@ -18,11 +18,11 @@
     </div>
     <div class="content2">
       <div class="header">
-        <el-button type="" :type="searchType == 1 ? 'primary' : ''" @click="handlestatus(1)">全部</el-button>
-        <el-button type="" :type="searchType == 2 ? 'primary' : ''" @click="handlestatus(2)">待审核</el-button>
-        <el-button type="" :type="searchType == 3 ? 'primary' : ''" @click="handlestatus(3)">待审批</el-button>
-        <el-button type="" :type="searchType == 4 ? 'primary' : ''" @click="handlestatus(4)">待还</el-button>
-        <el-button type="" :type="searchType == 5 ? 'primary' : ''" @click="handlestatus(5)">已还</el-button>
+        <el-button type="" :type="searchType == 0 ? 'primary' : ''" @click="handlestatus(1)">全部</el-button>
+        <el-button type="" :type="searchType == 1 ? 'primary' : ''" @click="handlestatus(2)">待审核</el-button>
+        <el-button type="" :type="searchType == 2 ? 'primary' : ''" @click="handlestatus(3)">待审批</el-button>
+        <el-button type="" :type="searchType == 3 ? 'primary' : ''" @click="handlestatus(4)">待还</el-button>
+        <el-button type="" :type="searchType == 4 ? 'primary' : ''" @click="handlestatus(5)">已还</el-button>
         <el-input placeholder="可按业务编号、合同编号、仓库名查找" class="search-input" v-model="searchKeyWord"></el-input>
         <el-button type="primary" @click='findList'>查找</el-button>
         <el-button type="primary" class="add" @click="add">添加</el-button>
@@ -35,23 +35,23 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="authenticationStatus" label="业务编号"></el-table-column>
-        <el-table-column prop="authenticationStatus" label="合同编号"></el-table-column>
-        <el-table-column prop="authenticationStatus" label="仓库名"></el-table-column>
-        <el-table-column prop="authenticationStatus" label="仓位号">
+        <el-table-column prop="billNo" label="业务编号"></el-table-column>
+        <el-table-column prop="contractNo" label="合同编号"></el-table-column>
+        <el-table-column prop="warehouseName" label="仓库名"></el-table-column>
+        <el-table-column prop="warehouseNo" label="仓位号">
           <!-- <template slot-scope="scope">
             <div>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</div>
           </template> -->
         </el-table-column>
-        <el-table-column prop="authenticationStatus" label="货名"></el-table-column>
-        <el-table-column prop="authenticationStatus" label="重量（吨）"></el-table-column>
-        <el-table-column prop="authenticationStatus" label="单价（元/吨）"></el-table-column>
-        <el-table-column prop="authenticationStatus" label="总价值（元）"></el-table-column>
-        <el-table-column prop="authenticationStatus" label="发放金额（元）"></el-table-column>
-        <el-table-column prop="authenticationStatus" label="应还金额（元）"></el-table-column>
-        <el-table-column prop="authenticationStatus" label="已还金额（元）"></el-table-column>
-        <el-table-column prop="authenticationStatus" label="待还金额（元）"></el-table-column>
-        <el-table-column prop="authenticationStatus" label="状态">
+        <el-table-column prop="goodsName" label="货名"></el-table-column>
+        <el-table-column prop="weight" label="重量（吨）"></el-table-column>
+        <el-table-column prop="unitPrice" label="单价（元/吨）"></el-table-column>
+        <el-table-column prop="totalValue" label="总价值（元）"></el-table-column>
+        <el-table-column prop="paymentAmount" label="发放金额（元）"></el-table-column>
+        <el-table-column prop="amountDue" label="应还金额（元）"></el-table-column>
+        <el-table-column prop="amountRepaid" label="已还金额（元）"></el-table-column>
+        <el-table-column prop="amountToRepaid" label="待还金额（元）"></el-table-column>
+        <el-table-column prop="status" label="状态">
           <!-- <template slot-scope="scope">
             <div>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</div>
           </template> -->
@@ -88,6 +88,9 @@
   import {
     getList
   } from '@/model/tradeServicesManagement/index'
+  import {
+    selectWarehouseSelf,
+  } from '@/model/houseSelfCollect/index'
   export default {
     components: {
       mapDrag
@@ -103,7 +106,9 @@
         pageSize: 10,
         deptBudgetTotal: 0,
         deptCircularPage: {},
-        searchType: '1',
+        searchType: '0',
+        warehouseList: [],
+        compId:'',
       }
     },
     activated() {},
@@ -124,16 +129,18 @@
         this.radio = '1'
         this.isActive = false
       }
-      // this.getList()
+      this.compId = sessionStorage.getItem('ws-pf_compId')
+      this.getList()
+      // this.getWarehouseList()
       this.tradeServicesList = [{
         authenticationStatus: 'test'
       }]
     },
     methods: {
       findList() {
-        // this.currentPage:=1
-        // this.pageSize=10
-        // this.getList()
+        this.currentPage=1
+        this.pageSize=10
+        this.getList()
       },
       handlestatus(status) {
         this.searchType = status
@@ -141,15 +148,36 @@
         // this.pageSize=10
         // this.getList()
       },
-      lookBtnClick(val1, val2) {},
-      toExamineBtnClick(val1, val2) {},
-      approveBtnClick(val1, val2) {},
-      repaymentBtnClick(val1, val2) {},
-      rowEditBtnClick(val1, val2) {},
+      lookBtnClick(val1, val2) {
+        this.$router.push({
+          name: 'warehouseReceiptLook'
+        })
+      },
+      toExamineBtnClick(val1, val2) {
+        this.$router.push({
+          name: 'reviewWarehouseReceipt'
+        })
+      },
+      approveBtnClick(val1, val2) {
+        this.$router.push({
+          name: 'approveWarehouseReceipt'
+        })
+      },
+      repaymentBtnClick(val1, val2) {
+        this.$router.push({
+          name: 'repayment'
+        })
+      },
+      rowEditBtnClick(val1, val2) {
+        this.$router.push({
+          name: 'warehouseReceiptEdit'
+        })
+      },
       rowDeleteBtnClick(val1, val2) {},
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)
         this.pageSize = val
+        this.getWarehouseList()
         this.getList()
       },
       handleCurrentChange(val) {
@@ -163,12 +191,21 @@
       startHacking1() {
         this.isActive = false
       },
+      getWarehouseList() {
+        selectWarehouseSelf({
+            compId: this.compId
+          })
+          .toPromise()
+          .then(response => {
+            this.warehouseList = response
+          })
+      },
       getList(e, type) {
         if (type == 1) {
           this.isActive = true
         }
         getList({
-            compId: sessionStorage.getItem('ws-pf_compId'),
+            compId: this.compId,
             currentPage: this.currentPage,
             pageSize: this.pageSize,
             searchType: this.searchType,
@@ -177,6 +214,7 @@
           .toPromise()
           .then((response) => {
             console.log('列表数据', response)
+            this.tradeServicesList = response.data.records
           })
       },
       selectShowType(e) {
@@ -223,7 +261,7 @@
 
 
   .content2 {
-    background: pink;
+    // background: pink;
     padding: 20px;
     height: calc(100% - 44px);