gjy 3 years ago
parent
commit
6a5b2bf7e2

+ 25 - 25
src/components/mapdrag/indexMap.vue

@@ -161,7 +161,7 @@
         AMapLoader.load({
           "key": "211dd6f989e719022aaf47ddb0659c47", // 申请好的Web端开发者Key,首次调用 load 时必填
           "version": "2.0", // 指定要加载的 JSAPI 的版本,缺省时默认为 1.4.15
-          "plugins": ['plugin=AMap.Scale', 'AMap.ToolBar','AMap.Autocomplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch'],
+          "plugins": ['plugin=AMap.Scale', 'AMap.ToolBar'],
           "Loca": { // 是否加载 Loca, 缺省不加载
             "version": '2.0.0' // Loca 版本,缺省 1.3.2
           },
@@ -193,26 +193,26 @@
           _coordinates1.push(Number(_position1[1]))
           _coordinates1.push(Number(_position1[0]))
           let _obj1 = {
-            'type': 'Feature',
-            'properties': {
-              'type': i,
+            "type": "Feature",
+            "properties": {
+              "type": i,
             },
-            'geometry': {
-              'type': 'Point',
-              'coordinates': _coordinates1
+            "geometry": {
+              "type": "Point",
+              "coordinates": _coordinates1
             }
           }
           let _position11 = _data.startPlace ? _data.startPlace.split(',') : []
           _coordinates11.push(Number(_position11[1]))
           _coordinates11.push(Number(_position11[0]))
           let _obj11 = {
-            'type': 'Feature',
-            'properties': {
-              'type': i,
+            "type": "Feature",
+            "properties": {
+              "type": i,
             },
-            'geometry': {
-              'type': 'Point',
-              'coordinates': _coordinates11
+            "geometry": {
+              "type": "Point",
+              "coordinates": _coordinates11
             }
           }
 
@@ -236,27 +236,27 @@
           _marker.name = _data.name
           this.markerList.push(_marker)
           let _obj2 = {
-            'type': 'Feature',
-            'properties': {
+            "type": "Feature",
+            "properties": {
 
             },
-            'geometry': {
-              'type': 'LineString',
-              'coordinates': _coordinates2
+            "geometry": {
+              "type": "LineString",
+              "coordinates": _coordinates2
             }
           }
           _features2.push(_obj2)
         }
         this.mapPointData = {
-          'type': 'FeatureCollection',
-          'features': _features1
+          "type": "FeatureCollection",
+          "features": _features1
         }
         this.mapLineData = {
-          'type': 'FeatureCollection',
-          'features': _features2
+          "type": "FeatureCollection",
+          "features": _features2
         }
-        console.log('this.mapPointData', this.mapPointData)
-        console.log('this.mapPointData', this.mapLineData)
+        console.log("this.mapPointData", this.mapPointData)
+        console.log("this.mapPointData", this.mapLineData)
 
       },
       loadmap(val) {
@@ -289,7 +289,7 @@
             map.add(marker);
             marker.setLabel({
               offset: new AMap.Pixel(0, 0), //设置文本标注偏移量
-              content: '<div class = \'maker-item\'>' + this.markerList[i].name + '</div>', //设置文本标注内容
+              content: "<div class = 'maker-item'>" + this.markerList[i].name + "</div>", //设置文本标注内容
               direction: 'right' //设置文本标注方位
 
             });

+ 4 - 0
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -1350,6 +1350,10 @@
 					this.dataList.inOutTaskNo = this.inOutTaskNo
 					this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
 					if (this.dataList.taskTypeKey == 3) {
+						this.dataList.sendWarehouse=this.dataList.warehouseName
+						this.dataList.receiveWarehouse=this.dataList1.warehouseName
+						this.dataList1.sendWarehouse=this.dataList.warehouseName
+						this.dataList1.receiveWarehouse=this.dataList1.warehouseName
 						this.dataList.businessDescribe = this.dataList1.businessDescribe
 					} else {
 						this.dataList1.businessDescribe = this.dataList.businessDescribe

+ 8 - 0
src/views/warehouse/warehouseManagementDelivery.vue

@@ -252,6 +252,14 @@
             <ws-input v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
               size="small" />
           </ws-form-item>
+          <ws-form-item label="车厢号-1" span="1" prop="wingNumber">
+            <ws-input v-model="deptBudgetList.wingNumber" placeholder="请输入车厢号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther">
+            <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
+              size="small" />
+          </ws-form-item>
         </ws-info-table>
       </div>
       <div class="small-title">上传磅单照片</div>

+ 8 - 0
src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -245,6 +245,14 @@
             <ws-input v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
               size="small" />
           </ws-form-item>
+          <ws-form-item label="车厢号-1" span="1" prop="wingNumber">
+            <ws-input v-model="deptBudgetList.wingNumber" placeholder="请输入车厢号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther">
+            <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
+              size="small" />
+          </ws-form-item>
         </ws-info-table>
       </div>
       <div class="small-title">上传磅单照片</div>

+ 8 - 0
src/views/warehouse/warehouseManagementPerfectput.vue

@@ -261,6 +261,14 @@
             <ws-input v-model="dataList.titleNoOther" placeholder="请输入封号" maxlength="20"
               size="small" />
           </ws-form-item>
+          <ws-form-item label="车厢号-1" span="1" prop="wingNumber">
+            <ws-input v-model="dataList.wingNumber" placeholder="请输入车厢号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther">
+            <ws-input v-model="dataList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
+              size="small" />
+          </ws-form-item>
           <ws-form-item label="成本" span="1" prop="cost">
             <ws-input
             :disabled='disabled1'

+ 8 - 0
src/views/warehouse/warehouseManagementPut.vue

@@ -326,6 +326,14 @@
             <ws-input v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
               size="small" />
           </ws-form-item>
+          <ws-form-item label="车厢号-1" span="1" prop="wingNumber">
+            <ws-input v-model="deptBudgetList.wingNumber" placeholder="请输入车厢号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther">
+            <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
+              size="small" />
+          </ws-form-item>
           <ws-form-item label="成本" span="1" prop="cost">
             <ws-input
               :disabled="disabled1"

+ 4 - 0
src/views/warehouse/warehouseManagementRecord.vue

@@ -135,6 +135,10 @@
 					</el-table-column>
 					<el-table-column prop="titleNoOther" label="封号-2">
 					</el-table-column>
+					<el-table-column prop="wingNumber" label="车厢号-1">
+					</el-table-column>
+					<el-table-column prop="wingNumberOther" label="车厢号-2">
+					</el-table-column>
 					<el-table-column prop="agent" label="经办人">
 					</el-table-column>
 					<el-table-column prop="backOffice" label="操作人" width="120px">

+ 8 - 0
src/views/warehouse/warehouseManagementTare.vue

@@ -152,6 +152,14 @@
             <ws-input v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
               size="small" />
           </ws-form-item>
+          <ws-form-item label="车厢号-1" span="1" prop="wingNumber">
+            <ws-input v-model="deptBudgetList.wingNumber" placeholder="请输入车厢号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther">
+            <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
+              size="small" />
+          </ws-form-item>
         </ws-info-table>
       </div>
       <!-- <div class="small-title">上传磅单照片</div>