홈 탐색 도움말
가입하기 로그인
gdc
/
yiliangyiyun-pc
1
0
포크 0
파일 이슈 0 풀 리퀘스트 0 위키
소스 검색

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

zhongtianhaoyuan 3 년 전
부모
62a8f037d9 d6a40fcb39
커밋
a703209e8d
15개의 변경된 파일과 1499개의 추가작업 그리고 292개의 파일을 삭제
분할 보기 변경상태 보기
  1. 5 3
      public/static/inspection.html
  2. 149 233
      src/components/mapdrag/warehouseReceiptMap.vue
  3. 1 0
      src/views/houseSelfCollect/paymentManagement.vue
  4. 257 5
      src/views/tradeServicesManagement/approveWarehouseReceipt.vue
  5. 172 3
      src/views/tradeServicesManagement/inOutRecord.vue
  6. 158 3
      src/views/tradeServicesManagement/repayment.vue
  7. 164 5
      src/views/tradeServicesManagement/warehouseReceiptAdd.vue
  8. 184 5
      src/views/tradeServicesManagement/warehouseReceiptEdit.vue
  9. 184 5
      src/views/tradeServicesManagement/warehouseReceiptLook.vue
  10. 214 21
      src/views/tradeServicesManagement/warehouseReceiptRegulation.vue
  11. 4 3
      src/views/tranManagement/tranManagementShippingFeedback.vue
  12. 2 2
      src/views/tranManagement/tranManagementShippingFeedbackLook.vue
  13. 2 1
      src/views/tranManagement/tranManagementUnShippingFeedback.vue
  14. 2 2
      src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue
  15. 1 1
      src/views/tranManagement/tranManagementVehicleDispatching.vue

+ 5 - 3
public/static/inspection.html
파일 보기 

@@ -19,8 +19,8 @@
 
 
       .content {
 
         width: 1000px;
 
-        height: 583px;
 
-        margin: auto;
 
+        padding: 30px 20px 20px 20px;
 
+        font-size: 18px;
 
         position: absolute;
 
         top: 0;
 
         bottom: 0;
 
@@ -66,7 +66,8 @@
 
 
       .title {
 
         text-align: center;
 
-        font-size: 24px;
 
+    font-size: 36px;
 
+    font-weight: 500;
 
       }
 
 
       .number {
 
@@ -117,6 +118,7 @@
 
   <body>
 
     <div id="app">
 
       <div class="content" v-if="bigContent">
 
+        <div class="title">{{tableData.compName}}</div>
 
         <div class="title">粮食质检单</div>
 
         <div class="number">{{tableData.qualityNo}}</div>
 
         <table class="table">

+ 149 - 233
src/components/mapdrag/warehouseReceiptMap.vue
파일 보기 

@@ -1,6 +1,8 @@
 
 <style lang='scss' scoped>
 
   .mapContent {
 
     position: relative;
 
+    height: 95%;
 
+    transition:.5s;
 
     .center-add {
 
       position: absolute;
 
       top: 0;
 
@@ -16,103 +18,14 @@
 
 
   #mapContainer {
 
     width: 100%;
 
-    height: 330px;
 
+    height: 100%;
 
   }
 
-
 
-  // #tip {
 
-  //   position: absolute;
 
-  //   top: -45px;
 
-  //   display: flex;
 
-  // }
 
-
 
-  // #tip .el-input {
 
-  //   // width: 179px;
 
-  //   margin-right: 0px;
 
-  // }
 
-
 
-  // #tip .el-select {
 
-  //   margin-right: 10px;
 
-  // }
 
-
 
-  // #tip .el-select {
 
-  //   width: 179px;
 
-  // }
 
-
 
-  // #tip .el-textarea {
 
-  //   width: 179px;
 
-
 
-  //   /deep/ .el-textarea__inner {
 
-  //     height: 40px;
 
-  //     resize: none;
 
-  //   }
 
-  // }
 
-
 
-  // .el-button--primary {
 
-  //   background-color: #5878e8;
 
-  //   border-color: #5878e8;
 
-  // }
 
-
 
-  // .el-button--default {
 
-  //   color: #5878e8;
 
-  //   border-color: #5473e8;
 
-  // }
 
-
 
-  // .address {
 
-  //   display: flex;
 
-  //   align-items: center;
 
-  //   margin-right: 20px;
 
-
 
-  //   // position:absolute;
 
-  //   // top: -35px;
 
-  //   .address-input {
 
-  //     display: inline-block;
 
-  //     width: 480px;
 
-  //   }
 
-  // }
 
 </style>
 
 
 <template>
 
   <div class="mapContent">
 
+    <div class="fixed">{{clickData}}</div>
 
     <div id="mapContainer"></div>
 
-    <!-- <div id="tip" v-show="showFlag === false ? false : true">
 
-      <el-select v-model="province" @change="selectP" placeholder="省">
 
-        <el-option
 
-          v-for="item in provinces"
 
-          :key="item.adcode"
 
-          :label="item.name"
 
-          :value="item.adcode"
 
-        >
 
-        </el-option>
 
-      </el-select>
 
-      <el-select v-model="city" @change="selectC" placeholder="市">
 
-        <el-option
 
-          v-for="item in citys"
 
-          :key="item.adcode"
 
-          :label="item.name"
 
-          :value="item.name"
 
-        >
 
-        </el-option>
 
-      </el-select>
 
-      <el-select v-model="district" @change="selectD" placeholder="区">
 
-        <el-option
 
-          v-for="item in districts"
 
-          :key="item.adcode"
 
-          :label="item.name"
 
-          :value="item.adcode"
 
-        >
 
-        </el-option>
 
-      </el-select>
 
-      <div class="address">
 
-        <el-input type="text" id="searchValue" placeholder="请输入关键字:" v-model="address" clearable class="address-input">
 
-        </el-input>
 
-      </div>
 
-      <el-button>经纬度：{{center}}</el-button>
 
-      <el-button @click="positions" type="primary" v-if='!isShowaddress'>确定定位</el-button>
 
-      <el-button @click="anewselect" v-if='!isShowaddress'>重新选择</el-button>
 
-      <el-button @click="submit" v-if='isShowaddress'>确定</el-button>
 
-    </div> -->
 
-
 
-
 
   </div>
 
 </template>
 
 
@@ -126,6 +39,7 @@
 
   export default {
 
     data() {
 
       return {
 
+        clickData:{},
 
         map: null,
 
         provinces: [],
 
         province: '',
 
@@ -186,164 +100,111 @@
 
           dragEnable: this.dragEnable,
 
         })
 
         this.map.on('click', function(e) {
 
-          if (this.status) {
 
-            var marker = new AMap.Marker({
 
-              position: new AMap.LngLat(e.lnglat.getLng(), e.lnglat
 
-                .getLat()), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
 
-            })
 
-            that.map.remove(that.markers)
 
-            that.$emit('marker', e)
 
-            that.markers.push(marker)
 
-            // 将创建的点标记添加到已有的地图实例：
 
-            that.map.add(marker)
 
-          }
 
+          // if (this.status) {
 
+          //   var marker = new AMap.Marker({
 
+          //     position: new AMap.LngLat(e.lnglat.getLng(), e.lnglat.getLat()), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
 
+          //   })
 
+          //   that.map.remove(that.markers)
 
+          //   that.$emit('marker', e)
 
+          //   that.markers.push(marker)
 
+          //   // 将创建的点标记添加到已有的地图实例：
 
+          //   that.map.add(marker)
 
+          // }
 
         })
 
         this.marker = new AMap.Marker({
 
           icon: new AMap.Icon({
 
-            size: new AMap.Size(0, 0),
 
-            image: image,
 
+            size: new AMap.Size(20, 20),
 
+            image: 'https://webapi.amap.com/theme/v1.3/markers/n/mark_b.pngimage',
 
           }),
 
-          map: that.map,
 
+            // icon: "https://webapi.amap.com/theme/v1.3/markers/n/mark_b.png",
 
+        position: [122.31016,40.670552]
 
         })
 
         AMap.plugin(
 
           ['AMap.Autocomplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch'],
 
           function() {
 
-            var autocomplete = new AMap.Autocomplete({
 
-              input: 'searchValue',
 
-            })
 
-            var placeSearch = new AMap.PlaceSearch({
 
-              city: that.acode,
 
-              citylimit: true,
 
-              pageSize: 1,
 
-              pageIndex: 1,
 
-              map: that.map,
 
-            })
 
-            var districtSearch = new AMap.DistrictSearch({
 
-              subdistrict: 1,
 
-              level: 'city',
 
-              showbiz: false,
 
-            });
 
+            // var autocomplete = new AMap.Autocomplete({
 
+            //   input: 'searchValue',
 
+            // })
 
+            // var placeSearch = new AMap.PlaceSearch({
 
+            //   city: that.acode,
 
+            //   citylimit: true,
 
+            //   pageSize: 1,
 
+            //   pageIndex: 1,
 
+            //   map: that.map,
 
+            // })
 
+            // var districtSearch = new AMap.DistrictSearch({
 
+            //   subdistrict: 1,
 
+            //   level: 'city',
 
+            //   showbiz: false,
 
+            // });
 
 
-            AMap.event.addListener(autocomplete, 'select', function(e) {
 
-              that.marker.setMap(that.map)
 
-              if (e.poi.location) {
 
-                placeSearch.search() // 关键字查询查询
 
-                that.marker.setPosition(e.poi.location)
 
-                geocoder.getAddress(e.poi.location, function(status, result) {
 
-                  console.log(e.poi.location, "klokolkjolk")
 
-                  if (status === 'complete') {
 
-                    var obj = {}
 
-                    that.province = result.regeocode.addressComponent.province
 
-                    that.city = result.regeocode.addressComponent.city
 
-                    that.district = result.regeocode.addressComponent.district
 
-                    obj.formattedAddress = result.regeocode.formattedAddress
 
-                    obj.areacode = result.regeocode.addressComponent.adcode
 
-                    that.address = result.regeocode.formattedAddress
 
-                    obj.lat = e.poi.location.lat
 
-                    obj.lng = e.poi.location.lng
 
-                    that.$emit('searchAddress', obj)
 
-                  } else {
 
-                    that.$emit('searchAddress', '')
 
-                  }
 
-                  that.map.setFitView()
 
-                })
 
-              } else {
 
-                districtSearch.search(e.poi.name, (status, result1) => {
 
-                  if (status == 'complete') {
 
-                    that.marker.setPosition(result1.districtList[0].center)
 
-                    geocoder.getAddress(result1.districtList[0].center, function(status, result) {
 
-                      if (status === 'complete') {
 
-                        var obj = {}
 
-                        that.province = result.regeocode.addressComponent.province
 
-                        that.city = result.regeocode.addressComponent.city
 
-                        that.district = result.regeocode.addressComponent.district
 
-                        obj.formattedAddress = result.regeocode.formattedAddress
 
-                        obj.areacode = result.regeocode.addressComponent.adcode
 
-                        that.address = result.regeocode.formattedAddress
 
-                        obj.lat = result1.districtList[0].center.lat
 
-                        obj.lng = result1.districtList[0].center.lng
 
-                        that.$emit('searchAddress', obj)
 
-                      } else {
 
-                        that.$emit('searchAddress', '')
 
-                      }
 
-                      that.map.setFitView()
 
-                    })
 
+            // AMap.event.addListener(autocomplete, 'select', function(e) {
 
+            //   that.marker.setMap(that.map)
 
+            //   if (e.poi.location) {
 
+            //     placeSearch.search() // 关键字查询查询
 
+            //     that.marker.setPosition(e.poi.location)
 
+            //     geocoder.getAddress(e.poi.location, function(status, result) {
 
+            //       console.log(e.poi.location, "klokolkjolk")
 
+            //       if (status === 'complete') {
 
+            //         var obj = {}
 
+            //         that.province = result.regeocode.addressComponent.province
 
+            //         that.city = result.regeocode.addressComponent.city
 
+            //         that.district = result.regeocode.addressComponent.district
 
+            //         obj.formattedAddress = result.regeocode.formattedAddress
 
+            //         obj.areacode = result.regeocode.addressComponent.adcode
 
+            //         that.address = result.regeocode.formattedAddress
 
+            //         obj.lat = e.poi.location.lat
 
+            //         obj.lng = e.poi.location.lng
 
+            //         that.$emit('searchAddress', obj)
 
+            //       } else {
 
+            //         that.$emit('searchAddress', '')
 
+            //       }
 
+            //       that.map.setFitView()
 
+            //     })
 
+            //   } else {
 
+            //     districtSearch.search(e.poi.name, (status, result1) => {
 
+            //       if (status == 'complete') {
 
+            //         that.marker.setPosition(result1.districtList[0].center)
 
+            //         geocoder.getAddress(result1.districtList[0].center, function(status, result) {
 
+            //           if (status === 'complete') {
 
+            //             var obj = {}
 
+            //             that.province = result.regeocode.addressComponent.province
 
+            //             that.city = result.regeocode.addressComponent.city
 
+            //             that.district = result.regeocode.addressComponent.district
 
+            //             obj.formattedAddress = result.regeocode.formattedAddress
 
+            //             obj.areacode = result.regeocode.addressComponent.adcode
 
+            //             that.address = result.regeocode.formattedAddress
 
+            //             obj.lat = result1.districtList[0].center.lat
 
+            //             obj.lng = result1.districtList[0].center.lng
 
+            //             that.$emit('searchAddress', obj)
 
+            //           } else {
 
+            //             that.$emit('searchAddress', '')
 
+            //           }
 
+            //           that.map.setFitView()
 
+            //         })
 
 
 
-                  }
 
-                })
 
-              }
 
-            })
 
+            //       }
 
+            //     })
 
+            //   }
 
+            // })
 
             // 经纬度
 
             var geocoder = new AMap.Geocoder({
 
               radius: 1000,
 
             })
 
-            that.map.on('moveend', function(e) {
 
-              //地图变动之后需要重新赋值省市区，未完成
 
-              that.center = that.map.getCenter(); //获取当前地图中心位置
 
-              that.center.lat = Number(that.center.lat.toFixed(3))
 
-              that.center.lng = Number(that.center.lng.toFixed(3))
 
-              that.center.Q = Number(that.center.Q.toFixed(3))
 
-              that.center.R = Number(that.center.R.toFixed(3))
 
-              for (var i = 0, l = that.polygons.length; i < l; i++) {
 
-                that.polygons[i].setMap(null)
 
-              }
 
-              that.marker.setMap(that.map)
 
-              that.marker.setPosition(that.center)
 
-              geocoder.getAddress(that.center, function(status, result) {
 
-                if (status === 'complete') {
 
-                  var obj = {}
 
-                  that.province = result.regeocode.addressComponent.province
 
-                  that.city = result.regeocode.addressComponent.city
 
-                  that.district = result.regeocode.addressComponent.district
 
-                  obj.formattedAddress = result.regeocode.formattedAddress
 
-                  obj.areacode = result.regeocode.addressComponent.adcode
 
-                  that.address = result.regeocode.formattedAddress
 
-                  obj.lat = that.center.lat
 
-                  obj.lng = that.center.lng
 
-                  that.$emit('pickedAddress', obj)
 
-                } else {
 
-                  that.$emit('pickedAddress', '')
 
-                }
 
-              })
 
-            });
 
-            that.map.on('zoomend', function() {
 
-              //地图变动之后需要重新赋值省市区，未完成
 
-              // this.zoom = map.getZoom(); //获取当前地图级别
 
-              that.center = that.map.getCenter(); //获取当前地图中心位置
 
-              that.center.lat = Number(that.center.lat.toFixed(3))
 
-              that.center.lng = Number(that.center.lng.toFixed(3))
 
-              that.center.Q = Number(that.center.Q.toFixed(3))
 
-              that.center.R = Number(that.center.R.toFixed(3))
 
-              for (var i = 0, l = that.polygons.length; i < l; i++) {
 
-                that.polygons[i].setMap(null)
 
-              }
 
-              that.marker.setMap(that.map)
 
-              that.marker.setPosition(that.center)
 
-              geocoder.getAddress(that.center, function(status, result) {
 
-                if (status === 'complete') {
 
-                  var obj = {}
 
-                  that.province = result.regeocode.addressComponent.province
 
-                  that.city = result.regeocode.addressComponent.city
 
-                  that.district = result.regeocode.addressComponent.district
 
-                  obj.formattedAddress = result.regeocode.formattedAddress
 
-                  obj.areacode = result.regeocode.addressComponent.adcode
 
-                  that.address = result.regeocode.formattedAddress
 
-                  obj.lat = that.center.lat
 
-                  obj.lng = that.center.lng
 
-                  that.$emit('pickedAddress', obj)
 
-                } else {
 
-                  that.$emit('pickedAddress', '')
 
-                }
 
-              })
 
-            });
 
-            // that.map.on('click', function (e) {
 
+            // that.map.on('moveend', function(e) {
 
+            //   //地图变动之后需要重新赋值省市区，未完成
 
+            //   that.center = that.map.getCenter(); //获取当前地图中心位置
 
+            //   that.center.lat = Number(that.center.lat.toFixed(3))
 
+            //   that.center.lng = Number(that.center.lng.toFixed(3))
 
+            //   that.center.Q = Number(that.center.Q.toFixed(3))
 
+            //   that.center.R = Number(that.center.R.toFixed(3))
 
             //   for (var i = 0, l = that.polygons.length; i < l; i++) {
 
             //     that.polygons[i].setMap(null)
 
             //   }
 
             //   that.marker.setMap(that.map)
 
-            //   that.marker.setPosition(e.lnglat)
 
-            //   geocoder.getAddress(e.lnglat, function (status, result) {
 
+            //   that.marker.setPosition(that.center)
 
+            //   geocoder.getAddress(that.center, function(status, result) {
 
             //     if (status === 'complete') {
 
             //       var obj = {}
 
             //       that.province = result.regeocode.addressComponent.province
 
@@ -352,14 +213,69 @@
 
             //       obj.formattedAddress = result.regeocode.formattedAddress
 
             //       obj.areacode = result.regeocode.addressComponent.adcode
 
             //       that.address = result.regeocode.formattedAddress
 
-            //       obj.lat = e.lnglat.lat
 
-            //       obj.lng = e.lnglat.lng
 
+            //       obj.lat = that.center.lat
 
+            //       obj.lng = that.center.lng
 
             //       that.$emit('pickedAddress', obj)
 
             //     } else {
 
             //       that.$emit('pickedAddress', '')
 
             //     }
 
             //   })
 
-            // })
 
+            // });
 
+            // that.map.on('zoomend', function() {
 
+            //   //地图变动之后需要重新赋值省市区，未完成
 
+            //   // this.zoom = map.getZoom(); //获取当前地图级别
 
+            //   that.center = that.map.getCenter(); //获取当前地图中心位置
 
+            //   that.center.lat = Number(that.center.lat.toFixed(3))
 
+            //   that.center.lng = Number(that.center.lng.toFixed(3))
 
+            //   that.center.Q = Number(that.center.Q.toFixed(3))
 
+            //   that.center.R = Number(that.center.R.toFixed(3))
 
+            //   for (var i = 0, l = that.polygons.length; i < l; i++) {
 
+            //     that.polygons[i].setMap(null)
 
+            //   }
 
+            //   that.marker.setMap(that.map)
 
+            //   that.marker.setPosition(that.center)
 
+            //   geocoder.getAddress(that.center, function(status, result) {
 
+            //     if (status === 'complete') {
 
+            //       var obj = {}
 
+            //       that.province = result.regeocode.addressComponent.province
 
+            //       that.city = result.regeocode.addressComponent.city
 
+            //       that.district = result.regeocode.addressComponent.district
 
+            //       obj.formattedAddress = result.regeocode.formattedAddress
 
+            //       obj.areacode = result.regeocode.addressComponent.adcode
 
+            //       that.address = result.regeocode.formattedAddress
 
+            //       obj.lat = that.center.lat
 
+            //       obj.lng = that.center.lng
 
+            //       that.$emit('pickedAddress', obj)
 
+            //     } else {
 
+            //       that.$emit('pickedAddress', '')
 
+            //     }
 
+            //   })
 
+            // });
 
+            that.map.on('click', function (e) {debugger
 
+              // for (var i = 0, l = that.polygons.length; i < l; i++) {
 
+              //   that.polygons[i].setMap(null)
 
+              // }
 
+              // that.marker.setMap(that.map)
 
+              // that.marker.setPosition(e.lnglat)
 
+              geocoder.getAddress(e.lnglat, function (status, result) {
 
+                if (status === 'complete') {
 
+                  that.clickData = result
 
+                  console.log(e.lnglat)
 
+                  var obj = {}
 
+                  that.province = result.regeocode.addressComponent.province
 
+                  that.city = result.regeocode.addressComponent.city
 
+                  that.district = result.regeocode.addressComponent.district
 
+                  obj.formattedAddress = result.regeocode.formattedAddress
 
+                  obj.areacode = result.regeocode.addressComponent.adcode
 
+                  that.address = result.regeocode.formattedAddress
 
+                  obj.lat = e.lnglat.lat
 
+                  obj.lng = e.lnglat.lng
 
+                  that.$emit('pickedAddress', obj)
 
+                } else {
 
+                  that.$emit('pickedAddress', '')
 
+                }
 
+              })
 
+            })
 
             // 根据坐标点定位,获取地址的详细信息
 
             if (that.position) {
 
               that.marker.setMap(that.map)

+ 1 - 0
src/views/houseSelfCollect/paymentManagement.vue
파일 보기 

@@ -975,6 +975,7 @@ import download from '../../components/WsDownload/download'
 
         sessionStorage.setItem('cwprint', true)
 
       },
 
       print(row) {
 
+        this.printType = 2
 
         sessionStorage.setItem('cwprint', false)
 
         getpaymentexamine({
 
             id: row.id

+ 257 - 5
src/views/tradeServicesManagement/approveWarehouseReceipt.vue
파일 보기 

@@ -1,26 +1,278 @@
 
 // 审批仓单
 
 <template>
 
 	<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 disabled 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 disabled 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 disabled 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 disabled 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>
 
+		<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>
 
+		<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='reject' type="primary">驳回</el-button>
 
+			  <el-button @click='pass'  type="primary">通过</el-button>
 
+		</div>
 
+		<div>审核记录</div>
 
+		 <el-table
 
+        class="wenzi"
 
+        :data="taskhistories"
 
+        style="width: 100%"
 
+      >
 
+        <el-table-column prop="operatorMajorRoleName" label="审核人">
 
+          <template scope="scope">
 
+            {{scope.row.operatorMajorRoleName}}{{scope.row.operatorName}}
 
+            </template>
 
+        </el-table-column>
 
+        <el-table-column prop="inOutTaskNo" label="审核结果">
 
+          <template scope="scope">
 
+            <span v-if='scope.row.approved'>通过</span>
 
+            <span v-if='!scope.row.approved'>驳回</span>
 
+          </template>
 
+        </el-table-column>
 
+        <el-table-column prop="endTime" label="审核时间"></el-table-column>
 
+        <el-table-column prop="auditMind" label="审核意见"></el-table-column>
 
+     </el-table>
 
+      <!-- </ws-info-table> -->
 
+		 </el-form>
 
+		 <el-dialog :visible.sync="isShowadjustment" :title="title">
 
+			<div>
 
+				<textarea placeholder="输入审核原因" name="" id="" cols="30" rows="10"></textarea>
 
+			</div>
 
+			<div>
 
+			 <el-button v-if='status==0' @click='' type="primary">确认驳回</el-button>
 
+			  <el-button v-if='status==1' @click='submit'  type="primary">确定通过</el-button>
 
+		</div>
 
+		</el-dialog>
 
 	</div>
 
 </template>
 
 <script>
 
 	import {
 
 		getList,
 
-	
 	} from '@/model/tradeServicesManagement/index'
 
+	import WsUpload from '@/components/WsUpload'
 
 	export default {
 
-		components: {},
 
+		components: {
 
+			WsUpload,
 
+		},
 
 		data() {
 
 			return {
 
-				
+				deptBudgetList:{},
 
+				size: 10,
 
+				compId: sessionStorage.getItem('ws-pf_compId'),
 
+				iscause:false,
 
+				title:'',
 
+				status:0
 
 			}
 
 		},
 
 		activated() {
 
 			
 		},
 
 		methods: {
 
-		
+		reject(){
 
+			this.iscause=true
 
+			this.title='审核原因'
 
+			this.status=0
 
+			// this.$router.push({ name: 'inOutRecord' })
 
+		},
 
+		pass(){
 
+			this.iscause=true
 
+			this.title='审核原因'
 
+			this.status=1
 
+		},
 
+		submit(){
 
+			this.iscause=false
 
+		},
 
+		rejectclick(){
 
+			this.iscause=false
 
+		},
 
+		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>

+ 172 - 3
src/views/tradeServicesManagement/inOutRecord.vue
파일 보기 

@@ -1,7 +1,91 @@
 
 // 出入库记录
 
 <template>
 
 	<div>
 
-		
+		<el-row>
 
+			<el-col :span="12">
 
+				<h2 class="bg-left title">修改合同信息</h2>
 
+			</el-col>
 
+			<el-col :span="12" class="bg-right">
 
+				<el-button class="bg-bottom" type="primary" size="small" @click="returnsales()"><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-row>
 
+			<el-col :span="12">
 
+				<span>鲅鱼圈1号库（102仓位）</span><span>现有储量：1000吨</span>
 
+				<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
 
+					start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
 
+				</el-date-picker>
 
+			</el-col>
 
+			<el-col :span="12" class="bg-right">
 
+				<el-button class="bg-bottom" type="primary" size="small" @click="adjustment()">
 
+				调整</el-button>
 
+				<el-button class="bg-bottom" type="primary" size="small" @click="print()">
 
+				打印</el-button>
 
+			</el-col>
 
+		</el-row>
 
+		<el-table
 
+        class="wenzi"
 
+        :data="recordList"
 
+        style="width: 100%"
 
+      >
 
+	  <el-table-column
 
+        :selectable="selectInit"
 
+        type="selection"
 
+        width="55"
 
+      ></el-table-column>
 
+      <el-table-column type="index" label="序号" width="50">
 
+        <template scope="scope">
 
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
 
+          <span v-else>{{ scope.$index + 1 }}</span>
 
+        </template>
 
+      </el-table-column>
 
+        <el-table-column prop="goodsName" label="货名">
 
+        </el-table-column>
 
+		<el-table-column prop="operatorMajorRoleName" label="毛重（吨）">
 
+        </el-table-column>
 
+		<el-table-column prop="operatorMajorRoleName" label="皮重（吨）">
 
+        </el-table-column>
 
+		<el-table-column prop="operatorMajorRoleName" label="扣重（吨）">
 
+        </el-table-column>
 
+		<el-table-column prop="operatorMajorRoleName" label="净重（吨）">
 
+        </el-table-column>
 
+		<el-table-column prop="operatorMajorRoleName" label="类型">
 
+        </el-table-column>
 
+		<el-table-column prop="operatorMajorRoleName" label="磅单">
 
+        </el-table-column>
 
+		<el-table-column prop="operatorMajorRoleName" label="结算单">
 
+        </el-table-column>
 
+		<el-table-column prop="operatorMajorRoleName" label="出入库日期">
 
+        </el-table-column>
 
+     </el-table>
 
+	<el-dialog :visible.sync="isShowadjustment" title="收款截图">
 
+     <div>
 
+		 <el-input
 
+            v-model="deptBudgetList.goodsName"
 
+            placeholder="输入申请金额"
 
+            size="small"
 
+          ></el-input>
 
+	 </div>
 
+    </el-dialog>
 
+	<div class="mask" v-show="isShowPrintType"></div>
 
+	<div class="print-type" v-show="isShowPrintType">
 
+      <div class="print-type-content">
 
+        <div class="print-type-title">打印凭证</div>
 
+        <div class="print-type-checkbox">
 
+          <el-checkbox-group v-model="ruleForm.type">
 
+            <el-checkbox label="打印磅单" name="type" class="label-width" @change="selectType"></el-checkbox>
 
+            <el-checkbox label="打印结算单" name="type" class="label-width" @change="selectType"></el-checkbox>
 
+            <!-- <el-checkbox label="打印发票" name="type" class="label-width" @change="selectType($event)"></el-checkbox> -->
 
+          </el-checkbox-group>
 
+        </div>
 
+      </div>
 
+      <div class="bottom-btn">
 
+        <el-button @click="typePrintClick(printType)">确定</el-button>
 
+        <el-button @click="typePrintCannelClick">取消</el-button>
 
+      </div>
 
+    </div>
 
 	</div>
 
 </template>
 
 <script>
 
@@ -13,17 +97,102 @@
 
 		components: {},
 
 		data() {
 
 			return {
 
-				
+				recordList:[],
 
+				value2:'',
 
+				isShowadjustment:false,
 
+				ruleForm: {
 
+					type: [
 
+						'打印磅单',
 
+						'打印结算单',
 
+					]
 
+				},
 
+				isShowPrintType:false,
 
+				deptBudgetList:{},
 
+				pickerOptions:[]
 
 			}
 
 		},
 
 		activated() {
 
 			
 		},
 
 		methods: {
 
-		
+			returnsales() {
 
+				this.$router.go(-1)
 
+			},
 
+			adjustment(){
 
+				this.isShowadjustment=true
 
+			},
 
+			print(){
 
+				this.isShowPrintType=true
 
+			},
 
+			selectType(){
 
+
 
+			},
 
+			typePrintClick(){
 
+
 
+			},
 
+			selectInit(){
 
+
 
+			},
 
+			typePrintCannelClick() {
 
+				this.isShowPrintType = false
 
+			},
 
 		},
 
 	}
 
 </script>
 
 <style lang="scss" scoped>
 
+	.bg-left {
 
+    padding-left: 30px;
 
+  }
 
+
 
+  .bg-right {
 
+    padding-right: 10px;
 
+    text-align: right;
 
+  }
 
+	.title {
 
+    position: relative;
 
+  }
 
+.bg-bottom {
 
+    margin: 15px 0px;
 
+  }
 
+  .title::before {
 
+    content: '';
 
+    display: inline-block;
 
+    width: 5px;
 
+    height: 30px;
 
+    background: #5473e8;
 
+    position: absolute;
 
+    left: 0;
 
+  }
 
+  .mask {
 
+    background: black;
 
+    width: 100vw;
 
+    height: 100vh;
 
+    position: fixed;
 
+    top: 0;
 
+    z-index: 99;
 
+    opacity: 0.3;
 
+  }
 
+
 
+  .print-type {
 
+    position: absolute;
 
+    top: 0;
 
+    bottom: 0;
 
+    left: 0;
 
+    right: 0;
 
+    margin: auto;
 
+    width: 200px;
 
+    height: 200px;
 
+    background: white;
 
+    border-radius: 10px;
 
+    z-index: 999;
 
+  }
 
+  .print-type-title {
 
+    text-align: center;
 
+    font-size: 18px;
 
+    margin: 20px;
 
+  }
 
+  .print-type-checkbox {
 
+    padding-left: 20px;
 
+  }
 
 
 </style>

+ 158 - 3
src/views/tradeServicesManagement/repayment.vue
파일 보기 

@@ -1,7 +1,77 @@
 
 // 还款
 
+// 出入库记录
 
 <template>
 
 	<div>
 
-		
+		<el-row>
 
+			<el-col :span="12">
 
+				<h2 class="bg-left title">还款记录</h2>
 
+			</el-col>
 
+			<el-col :span="12" class="bg-right">
 
+			</el-col>
 
+		</el-row>
 
+		<div>
 
+			<span>鸡西银行</span><span>鲅鱼圈1号库</span><span>鸡西银行</span><span>1000吨</span><span>业务编号：211103001</span>
 
+		</div>
 
+		<el-row>
 
+			<el-col :span="12">
 
+				<span>鸡西银行</span><span>鲅鱼圈1号库</span><span>鸡西银行</span><span>1000吨</span><span>业务编号：211103001</span>
 
+			</el-col>
 
+			<el-col :span="12" class="bg-right">
 
+				<el-button class="bg-bottom" type="primary" size="small" @click="payment()">
 
+				还款</el-button>
 
+			</el-col>
 
+		</el-row>
 
+		<el-table
 
+        class="wenzi"
 
+        :data="recordList"
 
+        style="width: 100%"
 
+      >
 
+      <el-table-column type="index" label="序号" width="50">
 
+        <template scope="scope">
 
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
 
+          <span v-else>{{ scope.$index + 1 }}</span>
 
+        </template>
 
+      </el-table-column>
 
+        <el-table-column prop="goodsName" label="还款金额（元）">
 
+        </el-table-column>
 
+		<el-table-column prop="operatorMajorRoleName" label="还款日期">
 
+        </el-table-column>
 
+		<el-table-column prop="operatorMajorRoleName" label="附件">
 
+        </el-table-column>
 
+		<el-table-column prop="operatorMajorRoleName" label="操作人">
 
+        </el-table-column>
 
+		<el-table-column prop="operatorMajorRoleName" label="操作时间">
 
+        </el-table-column>
 
+     </el-table>
 
+	 <el-dialog width="40%" :visible.sync="paymentForm" :append-to-body="true" title="还款">
 
+      <div class="tanchuang">
 
+        <ws-form>
 
+          <ws-info-table>
 
+            <ws-form-item label="待还金额（元）" prop="amountNotPayable">
 
+              {{
 
+              payments.amountNotPayable
 
+              }}
 
+            </ws-form-item>
 
+            <ws-form-item label="本次还款金额（元）" prop="money">
 
+              <ws-input type="number" @mousewheel.native.prevent v-model="payments.money" placeholder="请输入本次付款金额（元）"
 
+                maxlength="100" size="small" />
 
+            </ws-form-item>
 
+            <ws-form-item label="上传还款截图" prop=" paymentScreenshot"></ws-form-item>
 
+            <div class="upLoad">
 
+              <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
 
+                :on-success="handleAvatarSuccess">
 
+                <img v-if="imageUrl" :src="imageUrl" class="avatar" />
 
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
 
+              </el-upload>
 
+            </div>
 
+          </ws-info-table>
 
+          <div style="text-align: center; margin-top: 20px">
 
+            <el-button @click="paymentForm = false">取消</el-button>
 
+            <el-button @click="paymentSubmit">提交</el-button>
 
+          </div>
 
+        </ws-form>
 
+      </div>
 
+    </el-dialog>
 
 	</div>
 
 </template>
 
 <script>
 
@@ -13,17 +83,102 @@
 
 		components: {},
 
 		data() {
 
 			return {
 
-				
+				recordList:[],
 
+				value2:'',
 
+				isShowadjustment:false,
 
+				pickerOptions:[],
 
+				paymentForm:false,
 
+				payments:{}
 
 			}
 
 		},
 
 		activated() {
 
 			
 		},
 
 		methods: {
 
-		
+			returnsales() {
 
+				this.$router.go(-1)
 
+			},
 
+			selectType(){
 
+
 
+			},
 
+			typePrintClick(){
 
+
 
+			},
 
+			selectInit(){
 
+
 
+			},
 
+			payment() {
 
+				// this.imageUrl = ''
 
+				// if (this.modification.length == 0) {
 
+				// this.$message.warning('请选择要付款的条目')
 
+				// } else {
 
+				// let sum = 0
 
+				// let count = 0
 
+				// for (let i = 0; i < this.modification.length; i++) {
 
+				// 	sum += this.modification[i].amountIngPayable
 
+				// 	count += this.modification[i].amountEdPayable
 
+				// }
 
+				// this.payments.amountNotPayable = (sum - count).toFixed(2)
 
+				this.paymentForm = true
 
+				// }
 
+			},
 
 		},
 
 	}
 
 </script>
 
 <style lang="scss" scoped>
 
+	.bg-left {
 
+    padding-left: 30px;
 
+  }
 
+
 
+  .bg-right {
 
+    padding-right: 10px;
 
+    text-align: right;
 
+  }
 
+	.title {
 
+    position: relative;
 
+  }
 
+.bg-bottom {
 
+    margin: 15px 0px;
 
+  }
 
+  .title::before {
 
+    content: '';
 
+    display: inline-block;
 
+    width: 5px;
 
+    height: 30px;
 
+    background: #5473e8;
 
+    position: absolute;
 
+    left: 0;
 
+  }
 
+	.tanchuang {
 
+    margin: 0 auto;
 
+  }
 
+
 
+  .tanchuang .ws-info-table {
 
+    display: initial;
 
+  }
 
+
 
+  .tanchuang .ws-info-table .el-form-item {
 
+    margin: 0 auto;
 
+    text-align: center;
 
+  }
 
+   .ws-info-table {
 
+    border: none;
 
+  }
 
+
 
+  .ws-info-table .el-form-item {
 
+    width: 50%;
 
+    border: none;
 
+  }
 
+
 
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
 
+    width: 30%;
 
+    min-width: 125px;
 
+    text-align: center;
 
+    background: #ffffff;
 
+    color: #8890b1;
 
+  }
 
 
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
 
+    border: none;
 
+  }
 
 </style>

+ 164 - 5
src/views/tradeServicesManagement/warehouseReceiptAdd.vue
파일 보기 

@@ -1,26 +1,185 @@
 
 //创建仓单
 
 <template>
 
 	<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>
 
+      <!-- </ws-info-table> -->
 
+		 </el-form>
 
 	</div>
 
 </template>
 
 <script>
 
 	import {
 
 		getList,
 
-	
 	} from '@/model/tradeServicesManagement/index'
 
+	import WsUpload from '@/components/WsUpload'
 
 	export default {
 
-		components: {},
 
+		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()
 
+				})
 
+			},
 
 		},
 
 	}
 
 </script>

+ 184 - 5
src/views/tradeServicesManagement/warehouseReceiptEdit.vue
파일 보기 

@@ -1,26 +1,205 @@
 
 // 修改仓单
 
 <template>
 
 	<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-table
 
+        class="wenzi"
 
+        :data="taskhistories"
 
+        style="width: 100%"
 
+      >
 
+        <el-table-column prop="operatorMajorRoleName" label="审核人">
 
+          <template scope="scope">
 
+            {{scope.row.operatorMajorRoleName}}{{scope.row.operatorName}}
 
+            </template>
 
+        </el-table-column>
 
+        <el-table-column prop="inOutTaskNo" label="审核结果">
 
+          <template scope="scope">
 
+            <span v-if='scope.row.approved'>通过</span>
 
+            <span v-if='!scope.row.approved'>驳回</span>
 
+          </template>
 
+        </el-table-column>
 
+        <el-table-column prop="endTime" label="审核时间"></el-table-column>
 
+        <el-table-column prop="auditMind" label="审核意见"></el-table-column>
 
+     </el-table>
 
+      <!-- </ws-info-table> -->
 
+		 </el-form>
 
 	</div>
 
 </template>
 
 <script>
 
 	import {
 
 		getList,
 
-	
 	} from '@/model/tradeServicesManagement/index'
 
+	import WsUpload from '@/components/WsUpload'
 
 	export default {
 
-		components: {},
 
+		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()
 
+				})
 
+			},
 
 		},
 
 	}
 
 </script>

+ 184 - 5
src/views/tradeServicesManagement/warehouseReceiptLook.vue
파일 보기 

@@ -1,26 +1,205 @@
 
 // 查看仓单
 
 <template>
 
 	<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-table
 
+        class="wenzi"
 
+        :data="taskhistories"
 
+        style="width: 100%"
 
+      >
 
+        <el-table-column prop="operatorMajorRoleName" label="审核人">
 
+          <template scope="scope">
 
+            {{scope.row.operatorMajorRoleName}}{{scope.row.operatorName}}
 
+            </template>
 
+        </el-table-column>
 
+        <el-table-column prop="inOutTaskNo" label="审核结果">
 
+          <template scope="scope">
 
+            <span v-if='scope.row.approved'>通过</span>
 
+            <span v-if='!scope.row.approved'>驳回</span>
 
+          </template>
 
+        </el-table-column>
 
+        <el-table-column prop="endTime" label="审核时间"></el-table-column>
 
+        <el-table-column prop="auditMind" label="审核意见"></el-table-column>
 
+     </el-table>
 
+      <!-- </ws-info-table> -->
 
+		 </el-form>
 
 	</div>
 
 </template>
 
 <script>
 
 	import {
 
 		getList,
 
-	
 	} from '@/model/tradeServicesManagement/index'
 
+	import WsUpload from '@/components/WsUpload'
 
 	export default {
 
-		components: {},
 
+		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()
 
+				})
 
+			},
 
 		},
 
 	}
 
 </script>

+ 214 - 21
src/views/tradeServicesManagement/warehouseReceiptRegulation.vue
파일 보기 

@@ -1,27 +1,220 @@
 
 //贸易服务管理
 
 <template>
 
-	<div>
 
-		 <map-drag></map-drag>
 
-	</div>
 
+  <div class="container">
 
+    <map-drag :class="{active:isActive}"></map-drag>
 
+    <div class="bottom" :class="{active:isActive}">
 
+      <div class="bottom-content">
 
+        <div class="bottom-item" @click="startHacking">查看申请记录</div>
 
+        <div class="bottom-item">》》</div>
 
+        <el-checkbox v-model="checked" class="bottom-item">默认地图</el-checkbox>
 
+      </div>
 
+    </div>
 
+    <div class="top">
 
+      <div class="top-content">
 
+        <div class="top-item" @click="startHacking1">查看地图</div>
 
+        <div class="top-item">》》</div>
 
+        <el-checkbox v-model="checked" class="top-item">默认列表</el-checkbox>
 
+      </div>
 
+    </div>
 
+    <!-- <el-table :data="tableData" class="content2">
 
+      <el-table-column prop="date" label="日期" width="140"></el-table-column>
 
+      <el-table-column prop="name" label="姓名" width="120"></el-table-column>
 
+      <el-table-column prop="address" label="地址"></el-table-column>
 
+    </el-table>-->
 
+    <div class="content2">
 
+      <div class="header">
 
+        <el-button type="primary">全部</el-button>
 
+        <el-button type="primary">待审核</el-button>
 
+        <el-button type="primary">待审批</el-button>
 
+        <el-button type="primary">待还</el-button>
 
+        <el-button type="primary">已还</el-button>
 
+        <el-input placeholder="可按业务编号、合同编号、仓库名查找" class="search-input"></el-input>
 
+        <el-button type="primary">查找</el-button>
 
+        <el-button type="primary" class="add" @click="add">添加</el-button>
 
+      </div>
 
+      <el-table
 
+        :data="customertList"
 
+        style="width: 100%; margin-top: 20px"
 
+        ref="customertList"
 
+        border
 
+        height="600"
 
+      >
 
+        <el-table-column type="index" label="序号">
 
+          <template scope="scope">
 
+            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
 
+            <span v-else>{{ scope.$index + 1 }}</span>
 
+          </template>
 
+        </el-table-column>
 
+        <el-table-column prop="customerName" label="业务编号"></el-table-column>
 
+        <el-table-column prop="customerPhone" label="合同编号"></el-table-column>
 
+        <el-table-column prop="bankCard" label="仓库名"></el-table-column>
 
+        <el-table-column prop="bankDeposit" label="仓位号">
 
+          <!-- <template slot-scope="scope">
 
+            <div>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</div>
 
+          </template> -->
 
+        </el-table-column>
 
+        <el-table-column prop="payeeName" 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="bankDeposit" label="状态">
 
+          <!-- <template slot-scope="scope">
 
+            <div>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</div>
 
+          </template> -->
 
+        </el-table-column>
 
+        <el-table-column prop="address" label="操作">
 
+          <template slot-scope="scope">
 
+            <el-button
 
+              size="mini"
 
+              @click="createCustomer(scope.row, 2)"
 
+              v-show="scope.row.authenticationStatus!='已删除'"
 
+            >查看</el-button>
 
+			 <el-button
 
+              size="mini"
 
+              @click="createCustomer(scope.row, 2)"
 
+              v-show="scope.row.authenticationStatus!='已删除'"
 
+            >审核</el-button>
 
+			 <el-button
 
+              size="mini"
 
+              @click="createCustomer(scope.row, 2)"
 
+              v-show="scope.row.authenticationStatus!='已删除'"
 
+            >审批</el-button>
 
+			 <el-button
 
+              size="mini"
 
+              @click="createCustomer(scope.row, 2)"
 
+              v-show="scope.row.authenticationStatus!='已删除'"
 
+            >还款</el-button>
 
+            <el-button
 
+              size="mini"
 
+              @click="createCustomer(scope.row, 3)"
 
+              v-show="scope.row.authenticationStatus!='已删除'"
 
+              :disabled="!scope.row.isEdit"
 
+            >修改</el-button>
 
+            <el-button size="mini" type="danger" @click="handleDelete(scope.row, '')">删除</el-button>
 
+          </template>
 
+        </el-table-column>
 
+      </el-table>
 
+	   <div class="paging">
 
+        <el-pagination
 
+          @size-change="handleSizeChange"
 
+          @current-change="handleCurrentChange"
 
+          :current-page="currentPage"
 
+          :page-size="deptCircularPage.pageSize"
 
+          layout="total, sizes, prev, pager, next, jumper"
 
+          :total="deptBudgetTotal"
 
+        ></el-pagination>
 
+      </div>
 
+    </div>
 
+  </div>
 
 </template>
 
 <script>
 
-  import mapDrag from '@/components/mapdrag/warehouseReceiptMap'
 
-	import {getList} from '@/model/tradeServicesManagement/index'
 
-	export default {
 
-		 components: {mapDrag},
 
-		data() {
 
-			return {
 
-				
-			}
 
-		},
 
-		activated() {
 
-			
-		},
 
-		methods: {
 
-		
-		},
 
-	}
 
+import mapDrag from '@/components/mapdrag/warehouseReceiptMap'
 
+import { getList } from '@/model/tradeServicesManagement/index'
 
+export default {
 
+  components: { mapDrag },
 
+  data() {
 
+    const item = {
 
+      date: '2016-05-02',
 
+      name: '王小虎',
 
+      address: '上海市普陀区金沙江路 1518 弄'
 
+    }
 
+    return {
 
+      tableData: Array(20).fill(item),
 
+      isActive: false,
 
+      checked: true,
 
+	  customertList: [],
 
+	  currentPage: 1,
 
+      pageSize: 10,
 
+      deptBudgetTotal: 0,
 
+      deptCircularPage: {},
 
+    }
 
+  },
 
+  activated() {},
 
+  beforeCreate() {
 
+    document.querySelector('body').setAttribute('style', 'overflow:hidden;')
 
+  },
 
+  mounted() {
 
+    let height = document.body.offsetHeight - 57
 
+    document
 
+      .querySelector('.container')
 
+      .setAttribute('style', 'height:' + height + 'px;')
 
+    console.log('高度', height)
 
+  },
 
+  methods: {
 
+	     handleSizeChange(val) {
 
+      console.log(`每页 ${val} 条`)
 
+      this.pageSize = val
 
+      this.getList()
 
+    },
 
+    handleCurrentChange(val) {
 
+      this.currentPage = val
 
+      console.log(`当前页: ${val}`)
 
+      this.getList()
 
+    },
 
+    startHacking() {
 
+      this.isActive = true
 
+    },
 
+    startHacking1() {
 
+      this.isActive = false
 
+    },
 
+    add() {}
 
+  }
 
+}
 
 </script>
 
-<style lang="scss" scoped>
 
-
 
+<style lang="scss">
 
+.container {
 
+}
 
+.active {
 
+  height: 0 !important;
 
+  overflow: hidden;
 
+}
 
+.bottom {
 
+  display: flex;
 
+  justify-items: flex-end;
 
+  height: 5%;
 
+  align-content: center;
 
+  .bottom-content {
 
+    display: flex;
 
+    justify-content: flex-end;
 
+    width: 100%;
 
+  }
 
+  .bottom-item {
 
+    display: flex;
 
+    align-items: center;
 
+  }
 
+}
 
+.top {
 
+  display: flex;
 
+  justify-items: flex-end;
 
+  height: 5%;
 
+  align-content: center;
 
+  .top-content {
 
+    display: flex;
 
+    justify-content: flex-end;
 
+    width: 100%;
 
+  }
 
+  .top-item {
 
+    display: flex;
 
+    align-items: center;
 
+  }
 
+}
 
+.content2 {
 
+  background: pink;
 
+  padding: 20px;
 
+  .header{
 
+	  position: relative;
 
+	  .add{
 
+		  position: absolute;
 
+		  right: 0;
 
+	  }
 
+  }
 
+  .search-input {
 
+	width: 300px;
 
+	margin-left: 10px;
 
+  }
 
+}
 
 </style>

+ 4 - 3
src/views/tranManagement/tranManagementShippingFeedback.vue
파일 보기 

@@ -187,7 +187,7 @@
 
               </span>
 
             </div>
 
             <div class="catNos" v-if="item.shipType == '散船'">
 
-              仓位号-{{ index + 1 }}
 
+              仓位-{{ index + 1 }}
 
               <span class="noservice" v-show="item.status == '未装车'"
 
                 >未装船</span
 
               >
 
@@ -200,7 +200,7 @@
 
             </div>
 
             <!--箱号-->
 
             <el-form-item
 
-              label="箱号"
 
+              label="箱号:"
 
               prop="caseNo"
 
               v-if="item.shipType == '集装箱'"
 
             >
 
@@ -218,7 +218,7 @@
 
             </el-form-item>
 
             <!--封号-->
 
             <el-form-item
 
-              label="封号"
 
+              label="封号:"
 
               prop="titleNo"
 
               v-if="item.shipType == '集装箱'"
 
             >
 
@@ -237,6 +237,7 @@
 
             <!-- 仓位号 -->
 
             <ws-form-item
 
               span="1"
 
+              label="仓位号:"
 
               prop="binNumber"
 
               v-if="item.shipType == '散船'"
 
               >{{ item.binNumber }}</ws-form-item

+ 2 - 2
src/views/tranManagement/tranManagementShippingFeedbackLook.vue
파일 보기 

@@ -83,7 +83,7 @@
 
               </span>
 
             </div>
 
             <div class="catNos" v-if="item.shipType == '散船'">
 
-              仓位号-{{ index + 1 }}
 
+              仓位-{{ index + 1 }}
 
               <span class="noservice" v-show="item.status == '未装车'">未装船</span>
 
               <span class="service" v-show="item.status == '已装车'">已装船</span>
 
               <span class="serviced" v-show="item.status == '已送达'">
 
@@ -101,7 +101,7 @@
 
               <span>{{ item.titleNo }}</span>
 
             </ws-form-item>
 
             <!-- 仓位号 -->
 
-            <ws-form-item span="1" prop="binNumber" v-if="item.shipType == '散船'">{{ item.binNumber }}</ws-form-item>
 
+            <ws-form-item span="1" label="仓位号:" prop="binNumber" v-if="item.shipType == '散船'">{{ item.binNumber }}</ws-form-item>
 
             <!-- 计划重量 -->
 
             <ws-form-item label="计划重量(吨)" span="1" prop="positionWeight" v-if="item.shipType == '散船'">
 
               {{ item.positionWeight }}</ws-form-item>

+ 2 - 1
src/views/tranManagement/tranManagementUnShippingFeedback.vue
파일 보기 

@@ -186,7 +186,7 @@
 
               </span>
 
             </div>
 
             <div class="catNos" v-if="item.shipType == '散船'">
 
-              仓位号-{{ index + 1 }}
 
+              仓位-{{ index + 1 }}
 
               <span class="noservice" v-show="item.status == '未装车'">
 
                 未装船
 
               </span>
 
@@ -216,6 +216,7 @@
 
             <!-- 仓位号 -->
 
             <ws-form-item
 
               span="1"
 
+              label="仓位号:"
 
               prop="binNumber"
 
               v-if="item.shipType == '散船'"
 
             >

+ 2 - 2
src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue
파일 보기 

@@ -146,7 +146,7 @@
 
                 </span>
 
             </div>
 
             <div class="catNos" v-if="item.shipType == '散船'">
 
-              仓位号-{{ index + 1 }}
 
+              仓位-{{ index + 1 }}
 
               <span class="noservice" v-show="item.status == '未装车'">
 
                   未装船
 
                 </span>
 
@@ -166,7 +166,7 @@
 
              <span>{{ item.titleNo }}</span>
 
             </ws-form-item>
 
             <!--仓位号-->
 
-            <ws-form-item  span="1" prop="binNumber" v-if="item.shipType == '散船'">
 
+            <ws-form-item label="仓位号:" span="1" prop="binNumber" v-if="item.shipType == '散船'">
 
              <span>{{ item.binNumber }}</span>
 
             </ws-form-item>
 
             <!--装船净重-->

+ 1 - 1
src/views/tranManagement/tranManagementVehicleDispatching.vue
파일 보기 

@@ -336,7 +336,7 @@
 
                   maxlength="120"
 
                   size="small"
 
                 />
 
-              </ws-form-item>
 
+              </ws-form-item> 
             </ws-info-table>
 
             <span
 
               v-if="item.status == '未装车'||item.temporaryDriverFlag!=0"