Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

# Conflicts:
#	src/views/tradeServicesManagement/warehouseReceiptAdd.vue

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/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/statisticalReport/huoyunList.vue

@@ -1133,7 +1133,6 @@ export default {
           this.processNoId =this.processNoList[i].id
           this.tranPriceIng = this.processNoList[i].tranPriceIng
           this.priceStatus = this.processNoList[i].priceStatus
-            console.log( this.priceStatus)
         }
       }
       this.getList()

src/views/statisticalReport/shippingList.vue

@@ -112,7 +112,7 @@
       <!-- v-if="actualFreight && tranPriceIng" -->
        <div class="freightSet" v-if="processNo">
         <div style="display: flex;width:200px;line-height: 30px;"> 预计运费（元）：{{tranPriceIng}}元</div>
-        <span style="display: flex;line-height: 30px;">实际运费（元）：<el-input type="text" maxlength="70" size="small"  v-model="actualFreight" v-show="textShow"/><span v-show="!textShow">{{actualFreight == 0?tranPriceIng:actualFreight }}</span>元</span>
+        <span style="display: flex;line-height: 30px;">实际运费（元）：<el-input type="text" maxlength="70" size="small"  v-model="actualFreight" v-show="textShow"/><span v-show="!textShow">{{actualFreight ? actualFreight : tranPriceIng}}</span>元</span>
         <i @click="actualFreightchange" class="iconfont icon-dui" v-show="textShow" style="margin-top:10px"></i>
         <img
               width="17"
@@ -123,6 +123,17 @@
               alt=""
                v-show="!textShow"
             />
+            <span class="span_text">已付：{{amountEdPayable}}元
+                <img
+            width="18"
+            height="20"
+            style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png"
+            @click="fujian()"
+            alt=""
+          />{{paymentScreenshotList.length == 0 ? "暂无附件" : paymentScreenshotList.length}}</span>
+            <span class="span_text">未付：{{alreadyInvoice}}元</span>
+            <span class="span_text">{{priceStatus}}</span>
       </div>
 
       <el-table
@@ -131,8 +142,6 @@
         style="width: 100%; margin-top: 20px"
         ref="warehouseList"
         border
-        :summary-method="getSummaries"
-        show-summary
         @row-click="handleRowClick"
         @selection-change="handleSelectionChange"
       >
@@ -349,14 +358,14 @@
       </div>
     </el-dialog>
     <!--磅单 -->
-    <WinseaContentModal
+    <!-- <WinseaContentModal
       v-model="accessoryTFs"
       title="磅单信息"
       @on-cancel="handleClose"
     >
       <p>查看装车磅单</p>
         <img width="100" height="100" :src="loadingImg1" alt="" />
-    </WinseaContentModal>
+    </WinseaContentModal> -->
     <WinseaContentModal
       v-model="accesscard"
       title="磅单信息"
@@ -376,6 +385,15 @@
         <img style="width: 100px; height: 100px" :src="item" alt="" />
       </div>
     </WinseaContentModal>
+
+     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+			@on-cancel="accessoryTFs = false">
+      <div v-for="(item,index) in paymentScreenshotList" :key="index">
+			<!-- <ws-upload ref="upload" :comp-id="compId" :appendix-ids="item" :editable="false"
+				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" /> -->
+        <img :src="item" alt="附件" class="img_css">
+        </div>
+		</WinseaContentModal>
   </div>
   <!-- </div> -->
 </template>
@@ -526,6 +544,10 @@ export default {
           return time.getTime() > Date.now()
         },
       },
+       amountEdPayable : "",//已付金额
+      alreadyInvoice:"",//未付金额
+      priceStatus:"",//状态
+      paymentScreenshotList:[],//付款截图
     }
   },
   activated() {
@@ -1063,7 +1085,8 @@ export default {
              processNoValue:this.taskNoList[i].processNo[j].processNo,
              actualFreight : this.taskNoList[i].processNo[j].actualFreight,
              id:this.taskNoList[i].processNo[j].id,
-             tranPriceIng:this.taskNoList[i].processNo[j].tranPrice
+             tranPriceIng:this.taskNoList[i].processNo[j].tranPrice,
+              priceStatus:this.taskNoList[i].processNo[j].priceStatus
            })
           }
         }
@@ -1076,6 +1099,7 @@ export default {
           this.actualFreight = this.processNoList[i].actualFreight
           this.processNoId =this.processNoList[i].id
           this.tranPriceIng = this.processNoList[i].tranPriceIng
+          this.priceStatus = this.processNoList[i].priceStatus
         }
       }
       this.getList()
@@ -1094,6 +1118,10 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          this.$notify.success({
+                title: '成功',
+                message: '实际运费总价设置成功',
+              })
          this.textShow = false
         })
         })
@@ -1104,37 +1132,37 @@ export default {
       })
     },
     //合计
-    getSummaries(param) {
-      const { columns, data } = param
-      const sums = []
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = '合计'
-        } else if (
-          index === 13 ||
-          index === 14 ||
-          index === 15 ||
-          index === 16
-        ) {
-          const values = data.map((item) => Number(item[column.property]))
-          if (!values.every((value) => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-          } else {
-            sums[index] = '元'
-          }
-        } else {
-          sums[index] = '--'
-        }
-      })
-      return sums
-    },
+    // getSummaries(param) {
+    //   const { columns, data } = param
+    //   const sums = []
+    //   columns.forEach((column, index) => {
+    //     if (index === 0) {
+    //       sums[index] = '合计'
+    //     } else if (
+    //       index === 13 ||
+    //       index === 14 ||
+    //       index === 15 ||
+    //       index === 16
+    //     ) {
+    //       const values = data.map((item) => Number(item[column.property]))
+    //       if (!values.every((value) => isNaN(value))) {
+    //         sums[index] = values.reduce((prev, curr) => {
+    //           const value = Number(curr)
+    //           if (!isNaN(value)) {
+    //             return prev + curr
+    //           } else {
+    //             return prev
+    //           }
+    //         }, 0)
+    //       } else {
+    //         sums[index] = '元'
+    //       }
+    //     } else {
+    //       sums[index] = '--'
+    //     }
+    //   })
+    //   return sums
+    // },
     //列表
     getList() {
       autoList({
@@ -1154,12 +1182,11 @@ export default {
             response.records[i].settlementWeightchange = false
             response.records[i].deductionAmountchange = false
             response.records[i].amountNotPayable=response.records[i].amountIngPayable-response.records[i].amountEdPayable
-            //     response.records[i].settlementPrice =
-            //       response.records[i].unitPrice -
-            //       Math.abs(response.records[i].basisPrice) -
-            //       Math.abs(response.records[i].unloadingCharge) -
-            //       Math.abs(response.records[i].invoiceFee) -
-            //       Math.abs(response.records[i].deductionAmount)
+            if(this.processNo){
+                this.amountEdPayable += response.records[i].amountEdPayable // 已付
+                 this.alreadyInvoice += response.records[i].alreadyInvoice//未付
+                this.paymentScreenshotList = response.records[0].paymentScreenshot.split(",")//附件地址取运输阶段第一条
+              } 
           }
           this.deptBudgetTotal = response.total
           this.warehouseList = response
@@ -1523,7 +1550,18 @@ hr {
 .freightSet{
   margin: 10px 0 0 20px;
   display: flex;
-  width:500px;
+  width:800px;
+  .span_text{
+    margin-left: 20px;
+    line-height: 30px;
+  }
+}
+/deep/.freightSet .el-input{
+  width: 44%;
+}
+.findValue{
+  width: 300px;
+  margin-left: 5px;
 }
 /deep/.freightSet .el-input{
   width: 44%;
@@ -1532,4 +1570,8 @@ hr {
   width: 300px;
   margin-left: 5px;
 }
+.img_css{
+  width: 200px;
+  height: 200px;
+}
 </style>

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,148 +1,93 @@
 //创建仓单
 <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="billNo" class="forlist">
-          <el-input
-            v-model="deptBudgetList.billNo"
-            placeholder="请输入任务编号"
-            maxlength="20"
-            size="small"
-            disabled
-          ></el-input>
-        </el-form-item>
-		<el-form-item label="名头" span="1" prop="renown" class="forlist">
-		  	<el-select v-model="deptBudgetList.renown" 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="warehouseName" class="forlist">
-         	<el-select v-model="deptBudgetList.warehouseName" 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="warehouseNo" class="forlist">
-         	<el-select v-model="deptBudgetList.warehouseNo" 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.goodsName" 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="grade" label="品级" span="1">
-            <el-select v-model="deptBudgetList.grade" 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="weight" class="forlist">
-         	<el-input
-            v-model="deptBudgetList.weight"
-            placeholder="输入本次仓单申请所需的重量"
-            size="small"
-          ></el-input>
-        </el-form-item>
-		<el-form-item label="单价（元/吨）" span="1" prop="unitPrice" class="forlist">
-         	<el-input
-            v-model="deptBudgetList.unitPrice"
-            placeholder="输入粮食单价"
-            size="small"
-          ></el-input>
-        </el-form-item>
-		<el-form-item label="总价值（元）" span="1" prop="totalValue" class="forlist">
-         	<el-input
-            v-model="deptBudgetList.totalValue"
-            placeholder="自动计算，不可编辑"
-            size="small"
-          ></el-input>
-        </el-form-item>
-		<el-form-item label="申请比例（%）" span="1" prop="taskNo" class="forlist">
-         	<el-input
-            v-model="deptBudgetList.applicationProportion"
-            placeholder="输入申请比例"
-            size="small"
-          ></el-input>
-        </el-form-item>
-		<el-form-item label="申请金额（元）" span="1" prop="taskNo" class="forlist">
-         	<el-input
-            v-model="deptBudgetList.interest"
-            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="bank" label="银行" span="1">
-            <el-select v-model="deptBudgetList.bank" 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="three" class="forlist">
-         	<el-input
-            v-model="deptBudgetList.three"
-            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 {
@@ -203,8 +148,8 @@ export default {
 }	
 </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,14 +5,14 @@
     <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>
@@ -231,7 +231,10 @@
 </script>
 <style lang="scss" scoped>
   .container {}
-
+  .icon{
+    transform: rotate(90deg);
+    margin: 0 10px;
+  }
   .active {
     height: 0 !important;
     overflow: hidden;