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

public/static/weightCheckInOut.html

@@ -146,11 +146,11 @@
           </tr>
           <tr class="row">
             <td class="col col-bgc">毛重（吨）</td>
-            <td class="col" colspan="2">{{tableData.grossWeight*1000}}</td>
+            <td class="col" colspan="2">{{tableData.grossWeight}}</td>
             <td class="col col-bgc">皮重（吨）</td>
-            <td class="col" colspan="2">{{tableData.tare*1000}}</td>
+            <td class="col" colspan="2">{{tableData.tare}}</td>
             <td class="col col-bgc">净重（吨）</td>
-            <td class="col" colspan="2">{{tableData.netWeight*1000}}</td>
+            <td class="col" colspan="2">{{tableData.netWeight}}</td>
           </tr>
         </table>
         <div class="bottom">

src/components/mapdrag/indexMap.vue

@@ -159,11 +159,11 @@
         this.makeJsonData()
         AMapLoader.reset();
         AMapLoader.load({
-          'key': '211dd6f989e719022aaf47ddb0659c47', // 申请好的Web端开发者Key，首次调用 load 时必填
-          'version': '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-          'plugins': ['plugin=AMap.Scale', 'AMap.ToolBar'],
-          'Loca': { // 是否加载 Loca， 缺省不加载
-            'version': '2.0.0' // Loca 版本，缺省 1.3.2
+          "key": "211dd6f989e719022aaf47ddb0659c47", // 申请好的Web端开发者Key，首次调用 load 时必填
+          "version": "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+          "plugins": ['plugin=AMap.Scale', 'AMap.ToolBar'],
+          "Loca": { // 是否加载 Loca， 缺省不加载
+            "version": '2.0.0' // Loca 版本，缺省 1.3.2
           },
         }).then((AMap) => {
           this.loadmap()
@@ -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' //设置文本标注方位
 
             });

src/components/mapdrag/mapdrag.vue

@@ -168,6 +168,7 @@
       }
     },
     async created() {
+      AMapLoader.reset();
       // 已载入高德地图API，则直接初始化地图
       if (window.AMap && window.AMapUI) {
         // 未载入高德地图API，则先载入API再初始化

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

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>

src/views/warehouse/warehouseManagementGross.vue

@@ -1794,10 +1794,10 @@
               this.deptBudgetList.tips='卖方'+this.outContractNo[i].seller
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库入库') {
-              this.deptBudgetList.tips='出货库'+data.warehouseName
+              this.deptBudgetList.tips='出货库'+data.sendWarehouse
               this.deptBudgetList.inOutTypeKey = 3
             }else if (this.outContractNo[i].inOutType == '移库出库') {
-              this.deptBudgetList.tips='入货库'+data.warehouseName
+              this.deptBudgetList.tips='入货库'+data.receiveWarehouse
             } else if (this.outContractNo[i].inOutType == '暂存入库') {
               this.deptBudgetList.inOutTypeKey = 4
             } else if (this.outContractNo[i].inOutType == '贸易服务入库') {

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>

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'

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"

src/views/warehouse/warehouseManagementRecord.vue

@@ -43,7 +43,10 @@
 					<img v-if="status == 3" width="18" height="18" src="../../../public/img/radio-check.png"
 						alt="" />入库记录
 				</div>
-				<el-table show-summary :summary-method="getSummaries"   :data="warehouseList.records" height="560" v-show="this.warehouseType== '1'">
+				<el-date-picker  style="margin: 0 10px 0 0" class="dataClass" value-format='yyyy-MM-dd' v-model="value2" @change='datechange' type="daterange" align="right" unlink-panels range-separator="至"
+					start-placeholder="出入库日期起" end-placeholder="出入库日期止" >
+				</el-date-picker>
+				<el-table show-summary :summary-method="getSummaries" ref="tableData" :data="warehouseList.records" height="560" v-show="this.warehouseType== '1'">
 					<el-table-column type="expand">
 						<template #default="props">
 							<ws-form ref="deptBudgetList" :model="deptBudgetList">
@@ -86,7 +89,7 @@
 						</template>
 					</el-table-column>
 					<el-table-column prop="goodsName" label="货名" width="60px"> </el-table-column>
-					<el-table-column prop="type" label="类型" width="60px"> </el-table-column>
+					<!-- <el-table-column prop="type" label="类型" width="60px"> </el-table-column> -->
 					<el-table-column prop="grossWeight" label="毛重（吨）" >
 						
 					</el-table-column>
@@ -111,7 +114,7 @@
               }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="inOutDate" label="出入库日期">
+					<el-table-column prop="inOutDate" label="出入库日期" width="100px">
 						<template slot-scope="scope">
 							<span style="color: #8890b1">{{ scope.row.inOutDate }}</span>
 						</template>
@@ -135,6 +138,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">
@@ -247,11 +254,11 @@
 
 				</el-table>
 
+
 				<div style="text-align: center; padding: 10px">
-					<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>
+					    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-sizes="[10, 30, 50, 100,500,1000,9999]" layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"></el-pagination>
 				</div>
 			</ws-form>
 		</div>
@@ -323,6 +330,7 @@
 				remark: '',
 				binNumber: '',
 				status: 1,
+				value2:[],
 				// 提交类型
 				submitType: true,
 				selectpackingMethod: {},
@@ -360,9 +368,14 @@
 			this.capacity = this.$route.query.capacity
 			this.warehouseType = this.$route.query.warehouseType
 			this.getList()
-
+            this.getPassYearFormatDate()
 			this.showType = this.isShow
 		},
+		updated() {
+			this.$nextTick(() => {
+			this.$refs['tableData'].doLayout();
+			})
+		},
 		methods: {
 			//合计
 			getSummaries(param) {
@@ -372,7 +385,7 @@
 					if (index === 0) {
 						sums[index] = '合计'
 					} else if (
-						index === 7 
+						index === 6 
 					) {
 						const values = data.map((item) => Number(item[column.property]))
 						if (!values.every((value) => isNaN(value))) {
@@ -392,6 +405,39 @@
 				})
 				return sums
 			},
+		getPassYearFormatDate () {
+          var nowDate = new Date()
+          nowDate.setTime(nowDate.getTime()-24*60*60*1000*30)
+          var seperator1 = '-'
+          var year = nowDate.getFullYear()
+          var month = nowDate.getMonth() + 1
+          var strDate = nowDate.getDate()
+          if (month >= 1 && month <= 9) {
+            month = '0' + month
+          }
+          if (strDate >= 0 && strDate <= 9) {
+            strDate = '0' + strDate
+          }
+          var formatDate = year + seperator1 + month + seperator1 + strDate
+          this.getNowFormatDate(formatDate)
+        },
+		/* 获取现在时间，并接受过去时间的值 */
+        getNowFormatDate (formatDate) {
+			var date = new Date()
+			date.setTime(date.getTime()+24*60*60*1000)
+			var seperator1 = '-'
+			var year = date.getFullYear()
+			var month = date.getMonth() + 1
+			var strDate = date.getDate()
+			if (month >= 1 && month <= 9) {
+				month = '0' + month
+			}
+			if (strDate >= 0 && strDate <= 9) {
+				strDate = '0' + strDate
+			}
+			var nowData = year + seperator1 + month + seperator1 + strDate
+			this.value2= [formatDate, nowData]  // 默认赋值一年时间
+   		 },
 			print(row){
 				getPrintInfo({
                         id: row.id
@@ -441,6 +487,9 @@
 				}
 				return fmt
 			},
+			datechange(){
+				this.getList()
+			},
 			handleClose() {
 				this.accessoryTFs = false
 			},
@@ -472,12 +521,20 @@
 				// this.onChangeFlag = true
 			},
 			getList() {
+					var startDate=''
+					var endDate=''
+					if(this.value2){
+					startDate=this.value2[0]?this.value2[0]:''
+					endDate=this.value2[1]?this.value2[1]:''
+				}
 				if (this.warehouseType == 1) {
 					addselectinfoList({
 							compId: localStorage.getItem('ws-pf_compId'),
 							baseId: this.deptBudgetList.baseId,
 							positionId: this.deptBudgetList.positionId,
 							warehouseName: this.deptBudgetList.warehouseName,
+							startDate:startDate,
+       					    endDate:endDate,
 							searchType: this.searchType,
 							currentPage: this.currentPage,
 							pcFlag: this.pcFlag,
@@ -505,6 +562,8 @@
 							baseId: this.deptBudgetList.baseId,
 							positionId: this.deptBudgetList.positionId,
 							warehouseName: this.deptBudgetList.warehouseName,
+							startDate:startDate,
+       					    endDate:endDate,
 							searchType: this.searchType,
 							currentPage: this.currentPage,
 							pageSize: this.pageSize,
@@ -549,15 +608,6 @@
 				}
 				this.appendixIdss = row.receiveAttachmentPath
 			},
-			handleExamine(row) {
-				this.$router.push({
-					name: 'salesContractExamine',
-					query: {
-						id: row.id
-					},
-				})
-			},
-
 			// 关闭 dialog时 处理文件url 初始化upload组件
 			handleCloe() {
 				this.dialogViewSpareMoney = false
@@ -572,12 +622,6 @@
 						this.historyList = response
 					})
 			},
-			find() {
-				this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-				this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-				this.currentPage = 1
-				this.getList()
-			},
 			// async exportlist() {
 			//   const { data } = await export1(
 			//     {
@@ -954,6 +998,9 @@
 	.ws-info-table .el-form-item {
 		width: 14.28%;
 	}
+	.dataClass {
+       width: 20% !important;
+	}
 
 	/deep/.ws-info-table .el-form-item .el-form-item__label {
 		background-color: #f6f7fc;

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>
@@ -535,7 +543,7 @@
               this.deptBudgetList.tips='买方'+this.outContractNo[i].buyer
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库出库') {
-              this.deptBudgetList.tips='入货库'+data.warehouseName
+              this.deptBudgetList.tips='入货库'+data.receiveWarehouse
               this.deptBudgetList.inOutTypeKey = 3
             } else if (this.outContractNo[i].inOutType == '暂存入库') {
               this.deptBudgetList.inOutTypeKey = 4