前端 sdy

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">
@@ -206,6 +206,7 @@
         printBig() {},
       },
       mounted() {
+        console.log(this.getQueryVariable("tableData"))
         let _data = decodeURIComponent(this.getQueryVariable("tableData"))
         let _type = decodeURIComponent(this.getQueryVariable("type"))
         if (_type == 2) {

src/components/mapdrag/indexMap.vue

@@ -157,11 +157,10 @@
         this.listData = val1
         var that = this
         this.makeJsonData()
-        AMapLoader.reset();
         AMapLoader.load({
           "key": "211dd6f989e719022aaf47ddb0659c47", // 申请好的Web端开发者Key，首次调用 load 时必填
           "version": "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-          "plugins": ['plugin=AMap.Scale', 'AMap.ToolBar'],
+          "plugins": ['plugin=AMap.Scale', 'AMap.ToolBar','AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch'],
           "Loca": { // 是否加载 Loca， 缺省不加载
             "version": '2.0.0' // Loca 版本，缺省 1.3.2
           },

src/components/mapdrag/mapdrag.vue

@@ -126,6 +126,7 @@
     TextToCode
   } from 'element-china-area-data'
   import image from '../../../public/img/ic_locationmarker.jpg'
+  import AMapLoader from '@amap/amap-jsapi-loader';
   export default {
     data() {
       return {
@@ -168,16 +169,26 @@
       }
     },
     async created() {
+      
+        
+    },
+    mounted() {
+      // AMapLoader.reset();
       // 已载入高德地图API，则直接初始化地图
       if (window.AMap && window.AMapUI) {
         // 未载入高德地图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')
-      }
-    },
-    mounted() {
-      // console.log(this)
+        // await remoteLoad(`http://webapi.amap.com/maps?v=1.3&key=${MapKey}&plugin=AMap.AutoComplete`)
+        // await remoteLoad('http://webapi.amap.com/ui/1.0/main.js')
+        //  AMapLoader.reset();
+        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'],
+          "Loca": { // 是否加载 Loca， 缺省不加载
+            "version": '2.0.0' // Loca 版本，缺省 1.3.2
+          },
+        }).then((AMap) => {
       setTimeout(() => {
         var that = this
         this.map = new AMap.Map('mapContainer', {
@@ -207,9 +218,9 @@
           map: that.map,
         })
         AMap.plugin(
-          ['AMap.Autocomplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch'],
+          ['AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch'],
           function() {
-            var autocomplete = new AMap.Autocomplete({
+            var autocomplete = new AMap.AutoComplete({
               input: 'searchValue',
             })
             var placeSearch = new AMap.PlaceSearch({
@@ -224,8 +235,7 @@
               level: 'city',
               showbiz: false,
             });
-
-            AMap.event.addListener(autocomplete, 'select', function(e) {
+            autocomplete.on( 'select', function(e) {
               that.marker.setMap(that.map)
               if (e.poi.location) {
                 placeSearch.search() // 关键字查询查询
@@ -282,10 +292,9 @@
             that.map.on('moveend', function(e) {
               //地图变动之后需要重新赋值省市区，未完成
               that.center = that.map.getCenter(); //获取当前地图中心位置
+              console.log(that.center)
               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)
               }
@@ -312,10 +321,9 @@
               //地图变动之后需要重新赋值省市区，未完成
               // this.zoom = map.getZoom(); //获取当前地图级别
               that.center = that.map.getCenter(); //获取当前地图中心位置
+              console.log(that.center)
               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)
               }
@@ -338,29 +346,6 @@
                 }
               })
             });
-            // 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)
@@ -385,6 +370,11 @@
         )
       }, 500)
       this.loadmap()
+        // this.loadmap()
+        }).catch(e => {
+          console.log(e);
+        })
+      }
     },
     methods: {
       positions() {

src/components/mapdrag/warehouseReceiptMap.vue

@@ -77,7 +77,7 @@
         this.initMap()
         // 未载入高德地图API，则先载入API再初始化
       } else {
-        await remoteLoad(`http://webapi.amap.com/maps?v=1.3&key=${MapKey}`)
+        await remoteLoad(`http://webapi.amap.com/maps?v=1.3&key=${MapKey}&plugin=AMap.AutoComplete`)
         await remoteLoad('http://webapi.amap.com/ui/1.0/main.js')
         this.initMap()
       }

src/main.js

@@ -15,8 +15,8 @@ window.$crudCommon = crudCommon;
 import vendors from '@/vendors'
 const { router, store } = vendors
 Vue.config.productionTip = false
-import AMap from 'vue-amap';
-Vue.use(AMap);
+// import AMap from 'vue-amap';
+// Vue.use(AMap);
 import imgPreview from '@/components/imgPreview'
 Vue.use(imgPreview)
 import echarts from "echarts";
@@ -27,13 +27,13 @@ import Warehouse from './common.js'
 Vue.prototype.WAREHOUSE = Warehouse.houseName
 Vue.prototype.common = Warehouse
 // 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: 'd5486742b76ab0969e4c3ce26f46dfc6',
-  // 插件集合 （插件按需引入）
-  plugin: ['AMap.Geolocation', 'Geolocation', 'AMap.DistrictSearch', "AMap.PlaceSearch",],
-  v: '1.4.4'
-});
+// AMap.initAMapApiLoader({
+//   // 高德key
+//   key: 'd5486742b76ab0969e4c3ce26f46dfc6',
+//   // 插件集合 （插件按需引入）
+//   plugin: ['AMap.Geolocation', 'Geolocation', 'AMap.DistrictSearch', "AMap.PlaceSearch",'AMap.Autocomplete', 'AMap.Geocoder', 'AMap.DistrictSearch'],
+//   v: '1.4.4'
+// });
 // ------------ 通过域名判断起始的登陆页面 开始 --------------------
 //使用login的Url
 // const urls = [

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -1887,6 +1887,8 @@
   .address-btn {
     width: 100%;
     text-align: left;
+    color:#000;
+    border:1px solid #ccc;
   }
 
   .inline-input {

src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -1971,6 +1971,8 @@ export default {
 .address-btn {
   width: 100%;
   text-align: left;
+  color:#000;
+    border:1px solid #ccc;
 }
   .typeselect{
     width: 100%;

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -531,12 +531,14 @@
           this.deptBudgetList.contractGoodsInfo.outputPrivate = data[0]
           this.deptBudgetList.contractGoodsInfo.outputCity = data[1]
           this.deptBudgetList.contractGoodsInfo.outputArea = data[2]
+          this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = CodeToText[this.selectedOptions[0]]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
           this.deptBudgetList.placeDelivery = data[3]
+          this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },
       mapInputClick(type) {
@@ -1841,6 +1843,8 @@
   .address-btn {
     width: 100%;
     text-align: left;
+    color:#000;
+    border:1px solid #ccc;
   }
    .inline-input {
       width: 100%;

src/views/contractManagement/futuresSalesContractEdit.vue

@@ -1725,5 +1725,7 @@
   .address-btn {
     width: 100%;
     text-align: left;
+    color:#000;
+    border:1px solid #ccc;
   }
 </style>

src/views/contractManagement/purchaseContract.vue

@@ -498,7 +498,7 @@ export default {
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             if(response.records[i].completedQuantity){
-              response.records[i].completedQuantity=response.records[i].completedQuantity.tofixed(3)
+              response.records[i].completedQuantity=response.records[i].completedQuantity.toFixed(3)
             }
             
             if (response.records[i].addressUrl != null) {

src/views/contractManagement/purchaseContractAdd.vue

@@ -1878,6 +1878,8 @@
   .address-btn {
     width: 100%;
     text-align: left;
+    color:#000;
+    border:1px solid #ccc;
   }
 
   .inline-input {

src/views/contractManagement/purchaseContractEdit.vue

@@ -1569,5 +1569,7 @@
   .address-btn {
     width: 100%;
     text-align: left;
+    color:#000;
+    border:1px solid #ccc;
   }
 </style>

src/views/contractManagement/salesContract.vue

@@ -514,7 +514,7 @@ export default {
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             if(response.records[i].completedQuantity){
-              response.records[i].completedQuantity=response.records[i].completedQuantity.tofixed(3)
+              response.records[i].completedQuantity=response.records[i].completedQuantity.toFixed(3)
             }
             if (response.records[i].addressUrl != null) {
               if (response.records[i].addressUrl != '') {

src/views/contractManagement/salesContractAdd.vue

@@ -1895,6 +1895,8 @@
   .address-btn {
     width: 100%;
     text-align: left;
+    color:#000;
+    border:1px solid #ccc;
   }
 
   .inline-input {

src/views/contractManagement/salesContractEdit.vue

@@ -1641,5 +1641,7 @@
   .address-btn {
     width: 100%;
     text-align: left;
+    color:#000;
+    border:1px solid #ccc;
   }
 </style>

src/views/houseSelfCollect/weightCheck.vue

@@ -500,13 +500,13 @@
               }
             }
             else if (this.warehouseName && (this.warehouseName == '顺城粮库'||this.warehouseName == '鲅鱼圈金信库')) {
-              console.log(value)
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
-                if (tmp == '=') {
+                console.log(tmp)
+                if (String.fromCharCode(value[0]) == '.') {
                   flag = true
                 }
-                if (flag && result.length < 9 && tmp != '=') {
+                if (flag && result.length < 9 && tmp != '='&& tmp != '.') {
                   result += tmp
                 }
               }

src/views/outboundManagement/weighing.vue

@@ -236,11 +236,12 @@
 				else if (this.warehouseName && (this.warehouseName == '顺城粮库'||this.warehouseName == '鲅鱼圈金信库')) {
 					for (var i = value.length - 1; i >= 0; i--) {
 						var tmp = String.fromCharCode(value[i])
-						if (tmp == '=') {
-							flag = true
+						console.log(tmp)
+						if (String.fromCharCode(value[0]) == '.') {
+						flag = true
 						}
-						if (flag && result.length < 9 && tmp != '=') {
-							result += tmp
+						if (flag && result.length < 9 && tmp != '='&& tmp != '.') {
+						result += tmp
 						}
 					}
 					if (this.tpyeNo != 2) {

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

@@ -504,10 +504,11 @@
             else if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '顺城粮库'||this.deptBudgetList.warehouseName == '鲅鱼圈金信库')) {
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
-                if (tmp == '=') {
+                console.log(tmp)
+                if (String.fromCharCode(value[0]) == '.') {
                   flag = true
                 }
-                if (flag && result.length < 9 && tmp != '=') {
+                if (flag && result.length < 9 && tmp != '='&& tmp != '.') {
                   result += tmp
                 }
               }
@@ -1791,13 +1792,18 @@
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (this.outContractNo[i].contractNo == this.deptBudgetList.contractNo) {
             if (this.outContractNo[i].inOutType == '采购入库') {
-              this.deptBudgetList.tips='卖方'+this.outContractNo[i].seller
+              this.deptBudgetList.tips='卖方'+this.outContractNo[i].seller+ ' '+this.outContractNo[i].unitContractPrice+'（元/吨）'
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库入库') {
-              this.deptBudgetList.tips='出货库'+data.warehouseName
+              if(this.outContractNo[i].unitContractPrice){
+                this.deptBudgetList.tips='出货库'+data.sendWarehouse+ ' '+this.outContractNo[i].unitContractPrice+'（元/吨）'
+              }else{
+                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/warehouseManagementList.vue

@@ -28,7 +28,9 @@
           " @click="handleDelete()">删除</ws-button>
         <ws-button v-if='list.length>0'
            @click="handlTask()">任务</ws-button>
-           <ws-button @click="outData(1)">导出</ws-button>
+           <ws-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.add`
+          " @click="outData(1)">导出</ws-button>
            <ws-button @click="outData(2)">打印</ws-button>
       </template>
       <template slot="left">

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -527,10 +527,11 @@
             else if (this.deptBudgetList1.warehouseName && (this.deptBudgetList1.warehouseName == '顺城粮库'||this.deptBudgetList1.warehouseName == '鲅鱼圈金信库')) {
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
-                if (tmp == '=') {
+                console.log(tmp)
+                if (String.fromCharCode(value[0]) == '.') {
                   flag = true
                 }
-                if (flag && result.length < 9 && tmp != '=') {
+                if (flag && result.length < 9 && tmp != '='&& tmp != '.') {
                   result += tmp
                 }
               }

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -463,10 +463,11 @@
             else if (this.deptBudgetList1.warehouseName && (this.deptBudgetList1.warehouseName == '顺城粮库'||this.deptBudgetList1.warehouseName == '鲅鱼圈金信库')) {
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
-                if (tmp == '=') {
+                console.log(tmp)
+                if (String.fromCharCode(value[0]) == '.') {
                   flag = true
                 }
-                if (flag && result.length < 9 && tmp != '=') {
+                if (flag && result.length < 9 && tmp != '='&& tmp != '.') {
                   result += tmp
                 }
               }

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){
 				sessionStorage.removeItem("record_print")
 				getPrintInfo({
@@ -399,8 +445,7 @@
                       })
                         .toPromise()
                         .then((response) => {
-                            window.open( '../../../../../static/weightCheckInOut.html?type=2&tableData=' + JSON.stringify(response))
-							// window.open('../../../../../static/warehousePrint.html')
+                            window.open( '../../../../static/weightCheckInOut.html?type=2&tableData=' +encodeURIComponent(JSON.stringify(response)))
                         })
 			},
 			//返回按钮
@@ -443,6 +488,9 @@
 				}
 				return fmt
 			},
+			datechange(){
+				this.getList()
+			},
 			handleClose() {
 				this.accessoryTFs = false
 			},
@@ -474,12 +522,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,
@@ -507,6 +563,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,
@@ -551,15 +609,6 @@
 				}
 				this.appendixIdss = row.receiveAttachmentPath
 			},
-			handleExamine(row) {
-				this.$router.push({
-					name: 'salesContractExamine',
-					query: {
-						id: row.id
-					},
-				})
-			},
-
 			// 关闭 dialog时 处理文件url 初始化upload组件
 			handleCloe() {
 				this.dialogViewSpareMoney = false
@@ -574,12 +623,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(
 			//     {
@@ -956,6 +999,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>
@@ -433,10 +441,11 @@
             else if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '顺城粮库'||this.deptBudgetList.warehouseName == '鲅鱼圈金信库')) {
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
-                if (tmp == '=') {
+                console.log(tmp)
+                if (String.fromCharCode(value[0]) == '.') {
                   flag = true
                 }
-                if (flag && result.length < 9 && tmp != '=') {
+                if (flag && result.length < 9 && tmp != '='&& tmp != '.') {
                   result += tmp
                 }
               }
@@ -535,7 +544,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