Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

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/lang/zh.js

@@ -539,6 +539,8 @@ export default {
     //贸易服务
     tradeServicesManagement:'贸易服务管理',
     warehouseReceiptRegulation:'贸易服务管理',
+    stockWarehouseReceiptRegulation:'库存贸易服务',
+    onWaywarehouseReceiptRegulation:'在途贸易服务',
     warehouseReceiptAdd:'创建仓单',
     inOutRecord:'出入库记录',
     reviewWarehouseReceipt:'审核仓单',
@@ -4856,6 +4858,8 @@ export default {
   //贸易服务
   tradeServicesManagement:{
     warehouseReceiptRegulation:'贸易服务管理',
+    stockWarehouseReceiptRegulation:'库存贸易服务',
+    onWaywarehouseReceiptRegulation:'在途贸易服务',
     warehouseReceiptAdd:'创建仓单',
     inOutRecord:'出入库记录',
     reviewWarehouseReceipt:'审核仓单',

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/houseSelfCollect/weightCheck.vue

@@ -224,7 +224,7 @@
         paramType: '1',
         warehouseName: '',
         result1: '00',
-        allowEdit:0
+        allowEdit:0,
       }
     },
     activated() {
@@ -288,10 +288,11 @@
         getweighingList({
             compId: sessionStorage.getItem('ws-pf_compId'),
             currentPage: this.currentPage,
-            pageSize: 100,
+            pageSize: this.pageSize,
             searchKeyWord: '',
             warehouseName: sessionStorage.getItem('ck'),
-            managementType: 1
+            managementType: 1,
+            viewFlag:'1'
           })
           .toPromise()
           .then((response) => {

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

@@ -13,20 +13,35 @@ const tradeServicesManagementRouter = {
     icon: '-renwuguanli'
   },
   children: [
-    //贸易服务管理
+    //库存贸易服务
     {
       path: 'warehouseReceiptRegulation',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptRegulation'),
-      name: 'warehouseReceiptRegulation',
+      name: 'stockWarehouseReceiptRegulation',
       meta: {
-        title: 'warehouseReceiptRegulation',
+        title: 'stockWarehouseReceiptRegulation',
         shortcutEntrance: 'tradeServicesManagement',
         module: 'transportationTask.transportation.transportationInfo',
         permissicon: [],
         keepAlive: true
       },
-      hidden: true
+      hidden: false
+    },
+    //在途贸易服务
+    {
+      path: 'onWaywarehouseReceiptRegulation',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/onWaywarehouseReceiptRegulation'),
+      name: 'onWaywarehouseReceiptRegulation',
+      meta: {
+        title: 'onWaywarehouseReceiptRegulation',
+        shortcutEntrance: 'tradeServicesManagement',
+        module: 'transportationTask.transportation.transportationInfo',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: false
     },
     //创建仓单
     {
@@ -137,4 +152,4 @@ const tradeServicesManagementRouter = {
 
 };
 
-export default tradeServicesManagementRouter;
+export default tradeServicesManagementRouter;

src/views/tradeServicesManagement/onWaywarehouseReceiptRegulation.vue

@@ -0,0 +1,224 @@
+//贸易服务管理
+<template>
+  <div class="container">
+   <div class='tip'>火爆开发中...</div>
+  </div>
+</template>
+<script>
+  import mapDrag from '@/components/mapdrag/warehouseReceiptMap'
+  import {
+    getList
+  } from '@/model/tradeServicesManagement/index'
+  import {
+    selectWarehouseSelf,
+  } from '@/model/houseSelfCollect/index'
+  export default {
+    components: {
+      mapDrag
+    },
+    data() {
+      return {
+        searchVal: '',
+        searchKeyWord: '',
+        isActive: false,
+        radio: '1',
+        tradeServicesList: [],
+        currentPage: 1,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        deptCircularPage: {},
+        searchType: '0',
+        warehouseList: [],
+        compId:'',
+      }
+    },
+    activated() {},
+    beforeCreate() {
+      document.querySelector('body').setAttribute('style', 'overflow:hidden;')
+    },
+    mounted() {
+      let height = document.body.offsetHeight - 57
+      document.querySelector('.container').setAttribute('style', 'height:' + height + 'px;')
+      let _showPage = sessionStorage.getItem('warehouseReceiptRegulation_selectShowType')
+      if (_showPage == "1") {
+        this.radio = '1'
+        this.isActive = false
+      } else if (_showPage == "2") {
+        this.radio = '2'
+        this.isActive = true
+      } else {
+        this.radio = '1'
+        this.isActive = false
+      }
+      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()
+      },
+      handlestatus(status) {
+        this.searchType = status
+        // this.currentPage:=1
+        // this.pageSize=10
+        // this.getList()
+      },
+      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) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      startHacking() {
+        this.isActive = true
+      },
+      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: this.compId,
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchType: this.searchType,
+            searchKeyWord: this.searchKeyWord,
+          })
+          .toPromise()
+          .then((response) => {
+            console.log('列表数据', response)
+            this.tradeServicesList = response.data.records
+          })
+      },
+      selectShowType(e) {
+        this.activated = !this.activated;
+        sessionStorage.setItem('warehouseReceiptRegulation_selectShowType', e)
+      },
+      add() {
+        this.$router.push({
+          name: 'warehouseReceiptAdd'
+        })
+      }
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  .tip{
+    width: 300px;
+    height: 100px;
+    font-size: 48px;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+  }
+  .container {
+    position: relative;
+  }
+  .icon{
+    transform: rotate(90deg);
+    margin: 0 10px;
+  }
+  .active {
+    height: 0 !important;
+    overflow: hidden;
+  }
+
+  .bottom,
+  .top {
+    display: flex;
+    justify-items: flex-end;
+    height: 5%;
+    align-content: center;
+
+    .bottom-content,
+    .top-content {
+      display: flex;
+      justify-content: flex-end;
+      width: 100%;
+      padding-right: 25px;
+    }
+
+    .bottom-item,
+    .top-item {
+      display: flex;
+      align-items: center;
+    }
+  }
+
+
+  .content2 {
+    // background: pink;
+    padding: 20px;
+    height: calc(100% - 44px);
+
+    .header {
+      position: relative;
+
+      .add {
+        position: absolute;
+        right: 0;
+      }
+    }
+
+    .search-input {
+      width: 300px;
+      margin-left: 10px;
+    }
+  }
+
+  .paging {
+    margin-top: 10px;
+    text-align: center;
+  }
+</style>

src/views/tradeServicesManagement/warehouseReceiptAdd.vue

@@ -1,192 +1,139 @@
 //创建仓单
 <template>
-	<div>
-		 <el-form
-      ref="deptBudgetList"
-      :rules="mainReportAdd"
-      :model="deptBudgetList"
-    >
+  <div>
+    <el-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
       <!-- <ws-info-table class="el-table"> -->
-		  <div>申请信息</div>
-        <el-form-item label="业务编号" span="1" prop="taskNo" class="forlist">
-          <el-input
-            v-model="deptBudgetList.taskNo"
-            placeholder="请输入任务编号"
-            maxlength="20"
-            size="small"
-            disabled
-          ></el-input>
-        </el-form-item>
-		<el-form-item label="名头" span="1" prop="taskNo" class="forlist">
-		  	<el-select v-model="deptBudgetList.region" placeholder="请选择名头">
-				<el-option label="区域一" value="shanghai"></el-option>
-				<el-option label="区域二" value="beijing"></el-option>
-			</el-select>
-        </el-form-item>
-		<el-form-item label="仓库名称" span="1" prop="taskNo" class="forlist">
-         	<el-select v-model="deptBudgetList.region" placeholder="请选择仓库">
-				<el-option label="区域一" value="shanghai"></el-option>
-				<el-option label="区域二" value="beijing"></el-option>
-			</el-select>
-        </el-form-item>
-		<el-form-item label="仓位号" span="1" prop="taskNo" class="forlist">
-         	<el-select v-model="deptBudgetList.region" placeholder="请选择仓位号">
-				<el-option label="区域一" value="shanghai"></el-option>
-				<el-option label="区域二" value="beijing"></el-option>
-			</el-select>
-        </el-form-item>
-		<el-form-item label="仓库地址" span="1" prop="taskNo" class="forlist">
-         	<el-input
-            disabled
-            v-model="deptBudgetList.goodsName"
-            placeholder="请输入仓库地址"
-            size="small"
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="goodsName" label="货名" span="1">
-            <el-select v-model="deptBudgetList.region" placeholder="请选择货名">
-				<el-option label="区域一" value="shanghai"></el-option>
-				<el-option label="区域二" value="beijing"></el-option>
-			</el-select>
-        </el-form-item>
-		<el-form-item prop="goodsName" label="货名" span="1">
-            <el-select v-model="deptBudgetList.region" placeholder="请选择货名">
-				<el-option label="区域一" value="shanghai"></el-option>
-				<el-option label="区域二" value="beijing"></el-option>
-			</el-select>
-        </el-form-item>
-		<el-form-item prop="goodsName" label="品级" span="1">
-            <el-select v-model="deptBudgetList.region" placeholder="请选择品级">
-				<el-option label="区域一" value="shanghai"></el-option>
-				<el-option label="区域二" value="beijing"></el-option>
-			</el-select>
-        </el-form-item>
-		<el-form-item label="现有储量" span="1" prop="taskNo" class="forlist">
-         	<el-input
-            disabled
-            v-model="deptBudgetList.goodsName"
-            placeholder="请输入现有储量"
-            size="small"
-          ></el-input>
-        </el-form-item>
-		<el-form-item label="可用储量（吨）" span="1" prop="taskNo" class="forlist">
-         	<el-input
-            disabled
-            v-model="deptBudgetList.goodsName"
-            placeholder="请输入可用储量"
-            size="small"
-          ></el-input>
-        </el-form-item>
-		<el-form-item label="本单重量（吨）" span="1" prop="taskNo" class="forlist">
-         	<el-input
-            v-model="deptBudgetList.goodsName"
-            placeholder="输入本次仓单申请所需的重量"
-            size="small"
-          ></el-input>
-        </el-form-item>
-		<el-form-item label="单价（元/吨）" span="1" prop="taskNo" class="forlist">
-         	<el-input
-            v-model="deptBudgetList.goodsName"
-            placeholder="输入粮食单价"
-            size="small"
-          ></el-input>
-        </el-form-item>
-		<el-form-item label="总价值（元）" span="1" prop="taskNo" class="forlist">
-         	<el-input
-            v-model="deptBudgetList.goodsName"
-            placeholder="自动计算，不可编辑"
-            size="small"
-          ></el-input>
-        </el-form-item>
-		<el-form-item label="申请比例（%）" span="1" prop="taskNo" class="forlist">
-         	<el-input
-            v-model="deptBudgetList.goodsName"
-            placeholder="输入申请比例"
-            size="small"
-          ></el-input>
-        </el-form-item>
-		<el-form-item label="申请金额（元）" span="1" prop="taskNo" class="forlist">
-         	<el-input
-            v-model="deptBudgetList.goodsName"
-            placeholder="输入申请金额"
-            size="small"
-          ></el-input>
-        </el-form-item>
-		<div>附件</div>
-		<ws-upload
-        ref="upload"
-        :comp-id="compId"
-        :appendix-ids="deptBudgetList.addressUrl"
-        :size-limit="size"
-        @onChange="onChange"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
-	  <div>外审部门</div>
-	  	<el-form-item prop="goodsName" label="银行" span="1">
-            <el-select v-model="deptBudgetList.region" placeholder="请选择银行">
-				<el-option label="区域一" value="shanghai"></el-option>
-				<el-option label="区域二" value="beijing"></el-option>
-			</el-select>
-        </el-form-item>
-		<el-form-item label="第三方" span="1" prop="taskNo" class="forlist">
-         	<el-input
-            v-model="deptBudgetList.goodsName"
-            placeholder="无"
-            size="small"
-          ></el-input>
-        </el-form-item>
-		<div>
-			 <el-button @click='inoutput' type="primary">出入库记录</el-button>
-			  <el-button @click='submit'  type="primary">提交审核</el-button>
-		</div>
+      <div>申请信息</div>
+      <el-form-item label="业务编号" span="1" prop="taskNo" class="forlist">
+        <el-input v-model="deptBudgetList.taskNo" placeholder="请输入任务编号" maxlength="20" size="small" disabled></el-input>
+      </el-form-item>
+      <el-form-item label="名头" span="1" prop="taskNo" class="forlist">
+        <el-select v-model="deptBudgetList.region" placeholder="请选择名头">
+          <el-option label="区域一" value="shanghai"></el-option>
+          <el-option label="区域二" value="beijing"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仓库名称" span="1" prop="taskNo" class="forlist">
+        <el-select v-model="deptBudgetList.region" placeholder="请选择仓库">
+          <el-option label="区域一" value="shanghai"></el-option>
+          <el-option label="区域二" value="beijing"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仓位号" span="1" prop="taskNo" class="forlist">
+        <el-select v-model="deptBudgetList.region" placeholder="请选择仓位号">
+          <el-option label="区域一" value="shanghai"></el-option>
+          <el-option label="区域二" value="beijing"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仓库地址" span="1" prop="taskNo" class="forlist">
+        <el-input disabled v-model="deptBudgetList.goodsName" placeholder="请输入仓库地址" size="small"></el-input>
+      </el-form-item>
+      <el-form-item prop="goodsName" label="货名" span="1">
+        <el-select v-model="deptBudgetList.region" placeholder="请选择货名">
+          <el-option label="区域一" value="shanghai"></el-option>
+          <el-option label="区域二" value="beijing"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="goodsName" label="货名" span="1">
+        <el-select v-model="deptBudgetList.region" placeholder="请选择货名">
+          <el-option label="区域一" value="shanghai"></el-option>
+          <el-option label="区域二" value="beijing"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="goodsName" label="品级" span="1">
+        <el-select v-model="deptBudgetList.region" placeholder="请选择品级">
+          <el-option label="区域一" value="shanghai"></el-option>
+          <el-option label="区域二" value="beijing"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="现有储量" span="1" prop="taskNo" class="forlist">
+        <el-input disabled v-model="deptBudgetList.goodsName" placeholder="请输入现有储量" size="small"></el-input>
+      </el-form-item>
+      <el-form-item label="可用储量（吨）" span="1" prop="taskNo" class="forlist">
+        <el-input disabled v-model="deptBudgetList.goodsName" placeholder="请输入可用储量" size="small"></el-input>
+      </el-form-item>
+      <el-form-item label="本单重量（吨）" span="1" prop="taskNo" class="forlist">
+        <el-input v-model="deptBudgetList.goodsName" placeholder="输入本次仓单申请所需的重量" size="small"></el-input>
+      </el-form-item>
+      <el-form-item label="单价（元/吨）" span="1" prop="taskNo" class="forlist">
+        <el-input v-model="deptBudgetList.goodsName" placeholder="输入粮食单价" size="small"></el-input>
+      </el-form-item>
+      <el-form-item label="总价值（元）" span="1" prop="taskNo" class="forlist">
+        <el-input v-model="deptBudgetList.goodsName" placeholder="自动计算，不可编辑" size="small"></el-input>
+      </el-form-item>
+      <el-form-item label="申请比例（%）" span="1" prop="taskNo" class="forlist">
+        <el-input v-model="deptBudgetList.goodsName" placeholder="输入申请比例" size="small"></el-input>
+      </el-form-item>
+      <el-form-item label="申请金额（元）" span="1" prop="taskNo" class="forlist">
+        <el-input v-model="deptBudgetList.goodsName" placeholder="输入申请金额" size="small"></el-input>
+      </el-form-item>
+      <div>附件</div>
+      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
+        @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+      <div>外审部门</div>
+      <el-form-item prop="goodsName" label="银行" span="1">
+        <el-select v-model="deptBudgetList.region" placeholder="请选择银行">
+          <el-option label="区域一" value="shanghai"></el-option>
+          <el-option label="区域二" value="beijing"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="第三方" span="1" prop="taskNo" class="forlist">
+        <el-input v-model="deptBudgetList.goodsName" placeholder="无" size="small"></el-input>
+      </el-form-item>
+      <div>
+        <el-button @click='inoutput' type="primary">出入库记录</el-button>
+        <el-button @click='submit' type="primary">提交审核</el-button>
+      </div>
       <!-- </ws-info-table> -->
-		 </el-form>
-		 
-	</div>
+    </el-form>
+
+  </div>
 </template>
 <script>
-	import {
-		getList,
-	} from '@/model/tradeServicesManagement/index'
-	import WsUpload from '@/components/WsUpload'
-	export default {
-		components: {
-			WsUpload,
-		},
-		data() {
-			return {
-				deptBudgetList:{},
-				size: 10,
-				compId: sessionStorage.getItem('ws-pf_compId'),
-			}
-		},
-		activated() {
-			
-		},
-		methods: {
-		inoutput(){
-			this.$router.push({ name: 'inOutRecord' })
-		},
-		submit(){
+  import {
+    getList,
+  } from '@/model/tradeServicesManagement/index'
+  import WsUpload from '@/components/WsUpload'
+  export default {
+    components: {
+      WsUpload,
+    },
+    data() {
+      return {
+        deptBudgetList: {},
+        size: 10,
+        compId: sessionStorage.getItem('ws-pf_compId'),
+      }
+    },
+    activated() {
+
+    },
+    methods: {
+      inoutput() {
+        this.$router.push({
+          name: 'inOutRecord'
+        })
+      },
+      submit() {
 
-		},
-		onChange() {
-			this.$refs.upload
-				.handleSaveBill()
-				.then(async response => {
-				this.deptBudgetList.addressUrl = response
-				})
-				.catch(res => {
-				EventBus.$emit('error', (JSON.parse(res) || {}).message)
-				this.$refs.upload.clearFiles()
-				})
-			},
-		},
-	}
+      },
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async response => {
+            this.deptBudgetList.addressUrl = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
+      },
+    },
+  }
 </script>
 <style lang="scss" scoped>
-.el-form{
-	overflow: scroll;
-	height:94vh;
-}
-</style>
+  .el-form {
+    overflow: scroll;
+    height: 94vh;
+  }
+</style>

src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

@@ -5,24 +5,24 @@
     <div class="bottom" :class="{active:isActive}">
       <div class="bottom-content">
         <div class="bottom-item" @click="startHacking">查看申请记录</div>
-        <div class="bottom-item">》》</div>
+        <div class="bottom-item"><i class="el-icon-d-arrow-right icon"></i></div>
         <el-radio class="bottom-item" v-model="radio" label="1" @change="selectShowType">默认地图</el-radio>
       </div>
     </div>
     <div class="top">
       <div class="top-content">
         <div class="top-item" @click="startHacking1">查看地图</div>
-        <div class="top-item">》》</div>
+        <div class="top-item"><i class="el-icon-d-arrow-left icon"></i></div>
         <el-radio class="top-item" v-model="radio" label="2" @change="selectShowType">默认列表</el-radio>
       </div>
     </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) {
@@ -193,7 +231,10 @@
 </script>
 <style lang="scss" scoped>
   .container {}
-
+  .icon{
+    transform: rotate(90deg);
+    margin: 0 10px;
+  }
   .active {
     height: 0 !important;
     overflow: hidden;
@@ -223,7 +264,7 @@
 
 
   .content2 {
-    background: pink;
+    // background: pink;
     padding: 20px;
     height: calc(100% - 44px);