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

src/api/V2/tradeServicesManagement/index.js

@@ -0,0 +1,5 @@
+//仓库列表查看
+export const API_GET_WAREHOUSE_LOOK = '/warehouseBaseInfo/getWarehouse'
+
+
+

src/components/mapdrag/warehouseReceiptMap.vue

@@ -0,0 +1,506 @@
+<style lang='scss' scoped>
+  .mapContent {
+    position: relative;
+    .center-add {
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      margin: auto;
+      z-index: 999;
+      width: 30px;
+      height: 30px;
+    }
+  }
+
+  #mapContainer {
+    width: 100%;
+    height: 330px;
+  }
+
+  // #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 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>
+
+<script>
+  import {
+    regionData,
+    CodeToText,
+    TextToCode
+  } from 'element-china-area-data'
+  import image from '../../../public/img/ic_locationmarker.jpg'
+  export default {
+    data() {
+      return {
+        map: null,
+        provinces: [],
+        province: '',
+        districts: [],
+        district: '',
+        citys: [],
+        city: '',
+        polygons: [],
+        selectedOptions1: [],
+        areacode: '',
+        address: '',
+        objPoint: [],
+        markers: [],
+        zoomEnable: true,
+        dragEnable: true,
+        status: true,
+        center: '',
+      }
+    },
+    props: ['flagVisible', 'position', 'selectedOptions', 'isShowaddress', 'type'],
+    computed: {
+      showFlag() {
+        return this.flagVisible
+      },
+    },
+    watch: {
+      selectedOptions: {
+        handler(newValue, oldValue) {
+          this.province = CodeToText[newValue[0]]
+          this.selectP(this.province)
+          this.city = CodeToText[newValue[1]]
+          this.selectC(CodeToText[newValue[1]])
+          this.district = newValue[2]
+          this.selectD(this.district)
+        },
+        deep: true
+      }
+    },
+    async created() {
+      // 已载入高德地图API，则直接初始化地图
+      if (window.AMap && window.AMapUI) {
+        this.initMap()
+        // 未载入高德地图API，则先载入API再初始化
+      } else {
+        await remoteLoad(`http://webapi.amap.com/maps?v=1.3&key=${MapKey}`)
+        await remoteLoad('http://webapi.amap.com/ui/1.0/main.js')
+        this.initMap()
+      }
+    },
+    mounted() {
+      // console.log(this)
+      setTimeout(() => {
+        var that = this
+        this.map = new AMap.Map('mapContainer', {
+          resizeEnable: true,
+          zoom: 10,
+          zoomEnable: this.zoomEnable,
+          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)
+          }
+        })
+        this.marker = new AMap.Marker({
+          icon: new AMap.Icon({
+            size: new AMap.Size(0, 0),
+            image: image,
+          }),
+          map: that.map,
+        })
+        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,
+            });
+
+            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) {
+            //   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') {
+            //       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)
+              that.marker.setPosition(that.position)
+              geocoder.getAddress(that.position, function(status, result) {
+                if (status === 'complete') {
+                  var obj = {}
+                  obj.formattedAddress = result.regeocode.formattedAddress
+                  obj.areacode = result.regeocode.addressComponent.adcode
+                  that.address = result.regeocode.formattedAddress
+                  that.$emit('positionAddress', obj)
+                  that.province = result.regeocode.addressComponent.province
+                  that.city = result.regeocode.addressComponent.city
+                  that.district = result.regeocode.addressComponent.district
+                }
+              })
+              that.map.setFitView()
+            } else {
+              return false
+            }
+          }
+        )
+      }, 500)
+      this.loadmap()
+    },
+    methods: {
+      positions() {
+        this.status = false
+        var status = {
+          zoomEnable: false,
+          dragEnable: false,
+        }
+        this.map.setStatus(status)
+        this.loadmap()
+        let _data = []
+        _data.push(this.province)
+        _data.push(this.city)
+        _data.push(this.district)
+        _data.push(this.address)
+        _data.push(this.type)
+        this.$emit('addressListen', _data)
+      },
+      anewselect() {
+        this.status = true
+        var status = {
+          zoomEnable: true,
+          dragEnable: true,
+        }
+        this.map.setStatus(status)
+        this.loadmap()
+      },
+      loadmap(val) {
+        let params = val
+        var that = this // 插件
+        for (var j = 0, k = that.polygons.length; j < k; j++) {
+          that.polygons[j].setMap(null)
+        }
+        AMap.plugin(['AMap.DistrictSearch', 'AMap.Polygon'], function() {
+          // 标注
+          var opts = {
+            subdistrict: 1,
+            extensions: 'all',
+            showbiz: false,
+          }
+          var district = new AMap.DistrictSearch(opts) // 注意：需要使用插件同步下发功能才能这样直接使用
+          function getData(data) {
+            console.log(data)
+            that.$emit('selectedAddress', data)
+            // 清除地图上的所有覆盖物
+            that.areacode = data.citycode
+            var bounds = data.boundaries
+            if (data.level === 'country') {
+              that.provinces = data.districtList
+              that.citys = []
+              that.districts = []
+            } else if (data.level === 'province') {
+              that.map.remove(that.marker)
+              that.citys = data.districtList
+              that.districts = []
+              that.address = ''
+            } else if (data.level === 'city') {
+              that.districts = data.districtList
+            }
+            if (data.level === 'country' && bounds) {
+              return false
+            } else {
+              for (var i = 0, l = bounds.length; i < l; i++) {
+                var polygon = new AMap.Polygon({
+                  map: that.map,
+                  strokeWeight: 1,
+                  strokeColor: '#CC66CC',
+                  fillColor: '#CCF3FF',
+                  fillOpacity: 0.5,
+                  path: bounds[i],
+                })
+                that.polygons.push(polygon)
+              }
+              that.map.setFitView()
+            }
+          }
+          let sear = val ? params : '中国'
+          district.search(sear, function(status, result) {
+            if (status === 'complete') {
+              getData(result.districtList[0])
+            }
+          })
+        })
+      },
+      selectP(val) {
+        this.province = CodeToText[val]
+        if (this.status) {
+          this.$emit('provinceChange', val)
+          this.loadmap(val)
+          this.city = ''
+          this.district = ''
+        }
+      },
+      selectC(val) {
+        console.log(val)
+        if (this.status) {
+          this.loadmap(val)
+          this.district = ''
+        }
+      },
+      selectD(val) {
+        this.district = CodeToText[val]
+        if (this.status) {
+          this.loadmap(val)
+        }
+      },
+      submit() {
+        let _data = []
+        _data.push(this.province)
+        _data.push(this.city)
+        _data.push(this.district)
+        _data.push(this.address)
+        _data.push(this.type)
+        this.$emit('addressListen', _data)
+        this.$parent.blurMap()
+        console.log("submit")
+      }
+    },
+  }
+</script>

src/lang/zh.js

@@ -536,6 +536,16 @@ export default {
     procurementPlanEdit: '采购计划编辑',
     procurementPlanLook: '采购计划查看',
     purchaseOrderList: '采购订单',
+    //贸易服务
+    tradeServicesManagement:'贸易服务管理',
+    warehouseReceiptRegulation:'贸易服务管理',
+    warehouseReceiptAdd:'创建仓单',
+    inOutRecord:'出入库记录',
+    reviewWarehouseReceipt:'审核仓单',
+    approveWarehouseReceipt:'审批仓单',
+    repayment:'还款',
+    warehouseReceiptEdit:'修改仓单',
+    warehouseReceiptLook:'查看仓单',
 
     //销售管理
     salesManagement: '销售业务管理',
@@ -4842,6 +4852,18 @@ export default {
     warehouseManagementPutOut: '任务',
     warehouseManagementPutOutLook: '查看',
 
+  },
+  //贸易服务
+  tradeServicesManagement:{
+    warehouseReceiptRegulation:'贸易服务管理',
+    warehouseReceiptAdd:'创建仓单',
+    inOutRecord:'出入库记录',
+    reviewWarehouseReceipt:'审核仓单',
+    approveWarehouseReceipt:'审批仓单',
+    repayment:'还款',
+    warehouseReceiptEdit:'修改仓单',
+    warehouseReceiptLook:'查看仓单',
+
   },
   //采购计划管理
   purchasingManagement: {

src/model/tradeServicesManagement/index.js

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

src/views/contractManagement/salesContractAdd.vue

@@ -67,8 +67,10 @@
               placeholder="请输入卖方名称" @select="handleSelect"></el-autocomplete>
           </ws-form-item>
           <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
-            <el-radio v-model="deptBudgetList.deliverType" label="1">我方送货</el-radio>
-            <el-radio v-model="deptBudgetList.deliverType" label="2">对方自提</el-radio>
+            <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="1">我方送货</el-radio>
+            <el-radio v-model="deptBudgetList.deliverType" v-else label="1">我方送货</el-radio>
+            <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="2">对方自提</el-radio>
+            <el-radio v-model="deptBudgetList.deliverType" v-else label="2">对方自提</el-radio>
           </ws-form-item>
           <!--买方电话-->
           <ws-form-item label="买方电话" span="1" prop="contractNo">
@@ -1433,7 +1435,11 @@
           }
         }
       },
-      selectpriceType(e) {},
+      selectpriceType(e) {
+        if(e=='随行就市'){
+          this.deptBudgetList.deliverType = '1'
+        }
+      },
       weightchange(e) {
         this.deptBudgetList.finalTradingVolume = e
       },

src/views/tradeServicesManagement/approveWarehouseReceipt.vue

@@ -0,0 +1,29 @@
+// 审批仓单
+<template>
+	<div>
+		
+	</div>
+</template>
+<script>
+	import {
+		getList,
+	
+	} from '@/model/tradeServicesManagement/index'
+	export default {
+		components: {},
+		data() {
+			return {
+				
+			}
+		},
+		activated() {
+			
+		},
+		methods: {
+		
+		},
+	}
+</script>
+<style lang="scss" scoped>
+
+</style>

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

@@ -0,0 +1,140 @@
+import Layout from '@/layout/index';
+
+const tradeServicesManagementRouter = {
+
+  path: '/tradeServicesManagement',
+  component: Layout,
+  redirect: {name : 'warehouseReceiptRegulation'},
+  name: 'warehouseReceiptRegulation',
+  alwaysShow: true, // will always show the root menu
+  meta: {
+    title: 'warehouseReceiptRegulation',
+    module: 'transportationTask.transportation.transportationInfo',
+    icon: '-renwuguanli'
+  },
+  children: [
+    //贸易服务管理
+    {
+      path: 'warehouseReceiptRegulation',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptRegulation'),
+      name: 'warehouseReceiptRegulation',
+      meta: {
+        title: 'warehouseReceiptRegulation',
+        shortcutEntrance: 'tradeServicesManagement',
+        module: 'transportationTask.transportation.transportationInfo',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+    //创建仓单
+    {
+      path: 'warehouseReceiptAdd',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptAdd'),
+      name: 'warehouseReceiptAdd',
+      meta: {
+        title: 'warehouseReceiptAdd',
+        shortcutEntrance: 'tradeServicesManagement',
+        module: 'transportationTask.transportation.transportationInfo',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+    //审核仓单
+    {
+      path: 'reviewWarehouseReceipt',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/reviewWarehouseReceipt'),
+      name: 'reviewWarehouseReceipt',
+      meta: {
+        title: 'reviewWarehouseReceipt',
+        shortcutEntrance: 'tradeServicesManagement',
+        module: 'transportationTask.transportation.transportationInfo',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+     //审批仓单
+     {
+      path: 'approveWarehouseReceipt',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/approveWarehouseReceipt'),
+      name: 'approveWarehouseReceipt',
+      meta: {
+        title: 'approveWarehouseReceipt',
+        shortcutEntrance: 'tradeServicesManagement',
+        module: 'transportationTask.transportation.transportationInfo',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+    //出入库记录
+    {
+      path: 'inOutRecord',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/inOutRecord'),
+      name: 'inOutRecord',
+      meta: {
+        title: 'inOutRecord',
+        shortcutEntrance: 'tradeServicesManagement',
+        module: 'transportationTask.transportation.transportationInfo',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+     //修改仓单
+     {
+      path: 'warehouseReceiptEdit',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptEdit'),
+      name: 'warehouseReceiptEdit',
+      meta: {
+        title: 'warehouseReceiptEdit',
+        shortcutEntrance: 'tradeServicesManagement',
+        module: 'transportationTask.transportation.transportationInfo',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+     //查看仓单
+     {
+      path: 'warehouseReceiptLook',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptLook'),
+      name: 'warehouseReceiptLook',
+      meta: {
+        title: 'warehouseReceiptLook',
+        shortcutEntrance: 'tradeServicesManagement',
+        module: 'transportationTask.transportation.transportationInfo',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+     //还款
+     {
+      path: 'repayment',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/repayment'),
+      name: 'repayment',
+      meta: {
+        title: 'repayment',
+        shortcutEntrance: 'tradeServicesManagement',
+        module: 'transportationTask.transportation.transportationInfo',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+  ],
+
+};
+
+export default tradeServicesManagementRouter;

src/views/tradeServicesManagement/inOutRecord.vue

@@ -0,0 +1,29 @@
+// 出入库记录
+<template>
+	<div>
+		
+	</div>
+</template>
+<script>
+	import {
+		getList,
+	
+	} from '@/model/tradeServicesManagement/index'
+	export default {
+		components: {},
+		data() {
+			return {
+				
+			}
+		},
+		activated() {
+			
+		},
+		methods: {
+		
+		},
+	}
+</script>
+<style lang="scss" scoped>
+
+</style>

src/views/tradeServicesManagement/repayment.vue

@@ -0,0 +1,29 @@
+// 还款
+<template>
+	<div>
+		
+	</div>
+</template>
+<script>
+	import {
+		getList,
+	
+	} from '@/model/tradeServicesManagement/index'
+	export default {
+		components: {},
+		data() {
+			return {
+				
+			}
+		},
+		activated() {
+			
+		},
+		methods: {
+		
+		},
+	}
+</script>
+<style lang="scss" scoped>
+
+</style>

src/views/tradeServicesManagement/reviewWarehouseReceipt.vue

@@ -0,0 +1,29 @@
+//审核仓单
+<template>
+	<div>
+		
+	</div>
+</template>
+<script>
+	import {
+		getList,
+	
+	} from '@/model/tradeServicesManagement/index'
+	export default {
+		components: {},
+		data() {
+			return {
+				
+			}
+		},
+		activated() {
+			
+		},
+		methods: {
+		
+		},
+	}
+</script>
+<style lang="scss" scoped>
+
+</style>

src/views/tradeServicesManagement/warehouseReceiptAdd.vue

@@ -0,0 +1,29 @@
+//创建仓单
+<template>
+	<div>
+		
+	</div>
+</template>
+<script>
+	import {
+		getList,
+	
+	} from '@/model/tradeServicesManagement/index'
+	export default {
+		components: {},
+		data() {
+			return {
+				
+			}
+		},
+		activated() {
+			
+		},
+		methods: {
+		
+		},
+	}
+</script>
+<style lang="scss" scoped>
+
+</style>

src/views/tradeServicesManagement/warehouseReceiptEdit.vue

@@ -0,0 +1,29 @@
+// 修改仓单
+<template>
+	<div>
+		
+	</div>
+</template>
+<script>
+	import {
+		getList,
+	
+	} from '@/model/tradeServicesManagement/index'
+	export default {
+		components: {},
+		data() {
+			return {
+				
+			}
+		},
+		activated() {
+			
+		},
+		methods: {
+		
+		},
+	}
+</script>
+<style lang="scss" scoped>
+
+</style>

src/views/tradeServicesManagement/warehouseReceiptLook.vue

@@ -0,0 +1,29 @@
+// 查看仓单
+<template>
+	<div>
+		
+	</div>
+</template>
+<script>
+	import {
+		getList,
+	
+	} from '@/model/tradeServicesManagement/index'
+	export default {
+		components: {},
+		data() {
+			return {
+				
+			}
+		},
+		activated() {
+			
+		},
+		methods: {
+		
+		},
+	}
+</script>
+<style lang="scss" scoped>
+
+</style>

src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

@@ -0,0 +1,27 @@
+//贸易服务管理
+<template>
+	<div>
+		 <map-drag></map-drag>
+	</div>
+</template>
+<script>
+  import mapDrag from '@/components/mapdrag/warehouseReceiptMap'
+	import {getList} from '@/model/tradeServicesManagement/index'
+	export default {
+		 components: {mapDrag},
+		data() {
+			return {
+				
+			}
+		},
+		activated() {
+			
+		},
+		methods: {
+		
+		},
+	}
+</script>
+<style lang="scss" scoped>
+
+</style>

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -237,13 +237,13 @@
               />
             </ws-form-item>
             <!-- 提交 -->
-            <span class="servicedout" v-show="item.status == '已送达'"
+            <span class="serviced" v-show="item.status == '已送达'"
               >已卸车</span
             >
-            <span class="servicedout" v-show="item.status == '已装车'"
+            <span class="service" v-show="item.status == '已装车'"
               >未卸车</span
             >
-            <span class="noserviceout" v-show="item.status == '未装车'">{{
+            <span class="noservice" v-show="item.status == '未装车'">{{
               item.status
             }}</span>
             <!-- <span
@@ -1138,7 +1138,7 @@ export default {
 }
 //卸车详情
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 15%;
+  width: 16%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 50%;
@@ -1214,7 +1214,7 @@ export default {
 }
 //送达/未送达
 .noservice,
-.service {
+.service,.serviced {
   display: inline-block;
   border-radius: 4px;
   border: 1px solid #d8dce6;
@@ -1229,4 +1229,8 @@ export default {
   background: #e5f1f7;
   color: #50cad4;
 }
+.serviced {
+  background: #e5f1f7;
+  color: #5473E8 ;
+}
 </style>

src/views/tranManagement/tranManagementFireReceivingFeedbackLook.vue

@@ -203,10 +203,10 @@
           >
             {{ item.signStatus }}
           </div> -->
-            <span class="noserviceout" v-show="item.status == '未装车'"
+            <span class="noservice" v-show="item.status == '未装车'"
               >{{ item.status }}
             </span>
-            <span class="servicedout" v-show="item.status == '已送达'"
+            <span class="serviced" v-show="item.status == '已送达'"
               >已卸车</span
             >
             <span class="noserviceout" v-show="item.status == '未送达' || item.status == '已装车'"
@@ -815,7 +815,7 @@ export default {
 }
 //完货
 .noservice,
-.service {
+.service,.serviced {
   display: inline-block;
   border-radius: 4px;
   border: 1px solid #d8dce6;
@@ -826,10 +826,14 @@ export default {
   background: #c4cada;
   color: #ffffff;
 }
-.service {
+.service{
   background: #e5f1f7;
   color: #50cad4;
 }
+.serviced {
+  background: #e5f1f7;
+  color: #5473E8;
+}
 //卸车状态
 .noserviceout,
 .noserviceout {

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -938,7 +938,7 @@ export default {
 }
 //送达/未送达
 .noservice,
-.service {
+.service,.serviced {
   display: inline-block;
   border-radius: 4px;
   border: 1px solid #d8dce6;
@@ -949,10 +949,14 @@ export default {
   background: #c4cada;
   color: #ffffff;
 }
-.serviced {
+.service {
   background: #e5f1f7;
   color: #50cad4;
 }
+.serviced {
+  background: #e5f1f7;
+  color: #5473E8;
+}
 //添加司机
 .add {
   width: 100px;

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -857,7 +857,7 @@ margin-top: 20px;
 }
 //送达/未送达
 .noservice,
-.service {
+.service,.serviced{
   display: inline-block;
   border-radius: 4px;
   border: 1px solid #d8dce6;
@@ -872,4 +872,8 @@ margin-top: 20px;
   background: #e5f1f7;
   color: #50cad4;
 }
+.serviced {
+  background: #e5f1f7;
+  color: #5473E8;
+}
 </style>

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -547,8 +547,8 @@
             setUpTranPrice(tranProcessInfo)
               .toPromise()
               .then((response) => {
-                this.$message.success('提交成功')
-                this.getList()
+               this.$message.success('提交成功')
+                this.loaddata()
               })
           })
           .catch(() => {

src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -178,10 +178,10 @@
               <span class="noservice" v-show="item.status == '未装车'">
                 未装船
               </span>
-              <span class="noservice" v-show="item.status == '已装车'">
+              <span class="service" v-show="item.status == '已装车'">
                 未卸船
               </span>
-              <span class="service" v-show="item.status == '已送达'">
+              <span class="serviced" v-show="item.status == '已送达'">
                 已卸船
               </span>
             </div>
@@ -190,10 +190,10 @@
               <span class="noservice" v-show="item.status == '未装车'">
                 未装船
               </span>
-              <span class="noservice" v-show="item.status == '已装车'">
+              <span class="service" v-show="item.status == '已装车'">
                 未卸船
               </span>
-              <span class="service" v-show="item.status == '已送达'">
+              <span class="serviced" v-show="item.status == '已送达'">
                 已卸船
               </span>
             </div>
@@ -1286,6 +1286,10 @@ export default {
   background: #c4cada;
   color: #ffffff;
 }
+.serviced {
+  background: #e5f1f7;
+  color: #5473E8 ;
+}
 .service {
   background: #e5f1f7;
   color: #50cad4;

src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue

@@ -138,10 +138,10 @@
               <span class="noservice" v-show="item.status == '未装车'">
                   未装船
                 </span>
-                <span class="noservice" v-show="item.status == '已装车'">
+                <span class="service" v-show="item.status == '已装车'">
                    未卸船
                 </span>
-                 <span class="service" v-show="item.status == '已送达'">
+                 <span class="serviced" v-show="item.status == '已送达'">
                    已卸船
                 </span>
             </div>
@@ -150,10 +150,10 @@
               <span class="noservice" v-show="item.status == '未装车'">
                   未装船
                 </span>
-                <span class="noservice" v-show="item.status == '已装车'">
+                <span class="service" v-show="item.status == '已装车'">
                    未卸船
                 </span>
-                 <span class="service" v-show="item.status == '已送达'">
+                 <span class="serviced" v-show="item.status == '已送达'">
                    已卸船
                 </span>
             </div>
@@ -879,4 +879,8 @@ export default {
   background: #e5f1f7;
   color: #50cad4;
 }
+.serviced {
+  background: #e5f1f7;
+  color: #5473E8 ;
+}
 </style>

src/views/tranManagement/tranManagementVehicleLook.vue

@@ -3,7 +3,7 @@
   <div class="container">
     <el-row>
       <el-col :span="20">
-        <h2 class="bg-left title">查看派车详情</h2>
+        <h2 class="bg-left title">汽运调度详情</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
         <el-button

src/views/warehouse/warehouseManagementAdd.vue

@@ -58,6 +58,10 @@
         <ws-form-item label="总储量（吨）" span="1" prop="settlementMethod" v-show="radio == 1">
           <ws-input class="totalStorage" :readonly="true" v-model="totalStorage" maxlength="100" size="small" />
         </ws-form-item>
+        <ws-form-item label="是否自动获取重量" span="1" prop="automaticWeightAcquisition" class="readonly" style="180px">
+          <el-radio v-model="deptBudgetList.automaticWeightAcquisition" label="0">否</el-radio>
+          <el-radio v-model="deptBudgetList.automaticWeightAcquisition" label="1">是</el-radio>
+        </ws-form-item>
         <div style="width: 100%" class="flex position" v-for="(item, index) in freightspace" v-show="radio == 1"
           :key="index">
           <ws-form-item label="仓位编号" span="1" prop="contractNo" class="readonly">
@@ -138,6 +142,7 @@
         deptBudgetList: {
           totalStorage: 0,
           addressUrl: '',
+          automaticWeightAcquisition:'0'
         },
         options_: regionData,
         otherPersonPhone: '',
@@ -793,7 +798,7 @@
   }
 
   /deep/.ws-info-table .el-form-item .el-form-item__label {
-    width: 115px;
+    width: 130px;
     text-align: center;
     background: #fff;
     // border: 1px solid #cdd2dc;

src/views/warehouse/warehouseManagementEdit.vue

@@ -59,6 +59,10 @@
           <ws-form-item v-if="warehouseType == 1" label="总储量（吨)" span="1" prop="totalStorage">
             {{ totalStorage }}
           </ws-form-item>
+          <ws-form-item label="是否自动获取重量" span="1" prop="automaticWeightAcquisition" class="readonly" style="180px">
+          <el-radio v-model="deptBudgetList.automaticWeightAcquisition" label="0">否</el-radio>
+          <el-radio v-model="deptBudgetList.automaticWeightAcquisition" label="1">是</el-radio>
+        </ws-form-item>
         </ws-info-table>
         <div v-for="(item, index) in deptBudgetList.warehousePositionInfoList">
           <ws-info-table>
@@ -752,7 +756,7 @@
   }
 
   /deep/.ws-info-table .el-form-item .el-form-item__label {
-    width: 100px;
+    width: 130px;
     text-align: center;
     background: #fff;
     // border: 1px solid #cdd2dc;