修改样式

src/api/V2/tradeServicesManagement/index.js

@@ -1,6 +1,8 @@
 //贸易服务管理
 // 列表
 export const API_GET_TRADESERVICES_LIST  = '/tradeWarehouseReceiptAppl/selectTradeWarehouseReceiptAppl'
+//获取地图
+export const API_GET_MAPINFO  = '/tradeWarehouseReceiptAppl/getMapInfo'
 
 
 

src/model/tradeServicesManagement/index.js

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

src/views/tradeServicesManagement/warehouseReceiptAdd.vue

@@ -1,77 +1,90 @@
 //创建仓单
 <template>
-  <div>
-    <el-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
+  <div class="center">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left titleup">创建仓单</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button class="bg-bottom" type="primary" size="small" @click="cancel"><img width="6" height="10"
+            style="vertical-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
+        </el-button>
+      </el-col>
+    </el-row>
+    <el-form :inline="true" ref="deptBudgetList" label-position="right" class="content2" :rules="mainReportAdd" :model="deptBudgetList"  label-width="120px">
+      <div class="title1">申请信息</div>
       <!-- <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 label="业务编号" prop="taskNo" class="forlist">
+         <el-col>
+             <el-input v-model="deptBudgetList.taskNo" placeholder="请输入任务编号" maxlength="20" size="small" disabled></el-input>
+            </el-col>
+
       </el-form-item>
-      <el-form-item label="名头" span="1" prop="taskNo" class="forlist">
+      <el-form-item label="名头" 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-form-item label="仓库名称" 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-form-item label="仓位号" 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-form-item label="仓库地址" 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-form-item prop="goodsName" label="货名">
         <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-form-item prop="goodsName" label="货名">
         <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-form-item prop="goodsName" label="品级">
         <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-form-item label="现有储量" 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-form-item label="可用储量（吨）" 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-form-item label="本单重量（吨）" 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-form-item label="单价（元/吨）" 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-form-item label="总价值（元）" 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-form-item label="申请比例（%）" 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-form-item label="申请金额（元）" 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-form-item prop="goodsName" label="银行">
         <el-select v-model="deptBudgetList.region" placeholder="请选择银行">
           <el-option label="区域一" value="shanghai"></el-option>
           <el-option label="区域二" value="beijing"></el-option>
@@ -128,12 +141,65 @@
             this.$refs.upload.clearFiles()
           })
       },
+          cancel() {
+              this.$router.push({
+                path: 'warehouseReceiptRegulation'
+              })
+            },
     },
   }
 </script>
 <style lang="scss" scoped>
+  /deep/.el-form-item__content{
+    width: 400px;
+  }
+  /deep/.el-select{
+    width: 100%;
+  }
   .el-form {
     overflow: scroll;
     height: 94vh;
   }
+
+  .bg-left {
+    padding-left: 30px;
+  }
+
+  .bg-bottom {
+    margin: 15px 0px;
+  }
+
+  .titleup {
+    position: relative;
+  }
+
+  .titleup::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+
+  .bg-right {
+    padding-right: 10px;
+    text-align: right;
+  }
+
+  .center {
+    background: #f6f7fc;
+  }
+  .content2{
+    background: white;
+    // padding:0 200px;
+    // text-align: center;
+    padding-left: 40px;
+  }
+  .title1{
+    font-size: 20px;
+    font-weight: 600;
+    margin: 20px 0;
+  }
 </style>

src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

@@ -86,7 +86,8 @@
 <script>
   import mapDrag from '@/components/mapdrag/warehouseReceiptMap'
   import {
-    getList
+    getList,
+    getMapInfo
   } from '@/model/tradeServicesManagement/index'
   import {
     selectWarehouseSelf,
@@ -102,13 +103,14 @@
         isActive: false,
         radio: '1',
         tradeServicesList: [],
+        mapInfo: [],
         currentPage: 1,
         pageSize: 10,
         deptBudgetTotal: 0,
         deptCircularPage: {},
         searchType: '0',
         warehouseList: [],
-        compId:'',
+        compId: '',
       }
     },
     activated() {},
@@ -130,16 +132,24 @@
         this.isActive = false
       }
       this.compId = sessionStorage.getItem('ws-pf_compId')
+
       this.getList()
+      this.getMapInfo()
       // this.getWarehouseList()
       this.tradeServicesList = [{
         authenticationStatus: 'test'
       }]
     },
     methods: {
+      getMapInfo() {
+        getMapInfo().toPromise().then((response) => {
+          console.log('地图数据', response)
+          // this.mapInfo = response.data.records
+        })
+      },
       findList() {
-        this.currentPage=1
-        this.pageSize=10
+        this.currentPage = 1
+        this.pageSize = 10
         this.getList()
       },
       handlestatus(status) {
@@ -231,10 +241,12 @@
 </script>
 <style lang="scss" scoped>
   .container {}
-  .icon{
+
+  .icon {
     transform: rotate(90deg);
     margin: 0 10px;
   }
+
   .active {
     height: 0 !important;
     overflow: hidden;