Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

public/static/weightCheckOutNew.html

@@ -162,8 +162,8 @@
                             <td class="col" colspan="2">{{item.customer}}</td>
                             <td class="col col-bgc">联系电话</td>
                             <td class="col">{{item.customerPhone}}</td>
-                            <td class="col col-bgc">车牌号</td>
-                            <td class="col" colspan="2">{{item.carNumber}}</td>
+                            <td class="col col-bgc">货名</td>
+                            <td class="col" colspan="2">{{item.goodsName}}</td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">收货单位</td>
@@ -173,9 +173,9 @@
                             <td class="col col-bgc">联系电话</td>
                             <td class="col" colspan="2">{{item.personPhone}}</td>
                         </tr>
-                        
-                       
-                        <tr class="row">
+
+
+                        <!-- <tr class="row">
                             <td class="col col-bgc">货名</td>
                             <td class="col">{{item.goodsName}}</td>
                             <td class="col col-bgc">类型</td>
@@ -186,8 +186,8 @@
                             <td class="col col-bgc">不完善粒（%）</td>
                             <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
                             </td>
-                        </tr>
-                        <tr class="row">
+                        </tr> -->
+                        <!-- <tr class="row">
                             <td class="col col-bgc">等级</td>
                             <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
                             <td class="col col-bgc">水分（%）</td>
@@ -209,24 +209,50 @@
                             <td class="col">
                                 {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}</td>
                             <td class="col " colspan="2"></td>
-                        </tr>
+                        </tr> -->
+
                         <tr class="row">
-                            <td class="col col-bgc">毛重（公斤）</td>
-                            <td class="col">{{item.grossWeight}}</td>
+                            <td class="col col-bgc" >毛重（公斤）</td>
+                            <td class="col" colspan="2">{{item.grossWeight}}</td>
                             <td class="col col-bgc">皮重（公斤）</td>
                             <td class="col">{{item.tare}}</td>
-                            <td class="col col-bgc">扣重（公斤）</td>
-                            <td class="col">{{item.buckleMiscellaneous}}</td>
+                            <!-- <td class="col col-bgc">扣重（公斤）</td>
+                            <td class="col">{{item.buckleMiscellaneous}}</td> -->
                             <td class="col col-bgc">净重（公斤）</td>
                             <td class="col">{{item.netWeight}}</td>
                             <!-- <td class="col " colspan="2"></td> -->
-
                         </tr>
                         <tr class="row">
-                            <td class="col col-bgc" colspan="2">毛重检斤时间</td>
-                            <td class="col" colspan="2">{{item.grossDate}}</td>
-                            <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
-                            <td class="col" colspan="2">{{item.tareDate}}</td>
+                            <!-- <td class="col col-bgc">运输方式</td> -->
+                            <!-- <td class="col" >{{item.outType}}</td> -->
+                           
+                            <td class="col" colspan="2" v-if='item.outType=="散船"'>{{item.shipName}}</td>
+                            <td class="col col-bgc" v-if='item.outType=="火运"'>车厢号</td>
+                            <td class="col col-bgc" v-if='item.outType=="散船"'>船次</td>
+                            
+                            <td class="col col-bgc" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>封号</td>
+                            <td class="col" colspan="2" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>
+                                {{item.titleNo}}   {{item.titleNoOther}}
+                            </td>
+                            <td class="col col-bgc" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>箱号</td>
+                            <td class="col" colspan="3" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>
+                                {{item.boxNo}}       {{item.boxNoOther}}
+                            </td>
+                            <td class="col" colspan="2" v-if='item.outType=="火运"'>
+                                {{item.wingNumber}} {{item.wingNumberOther}}
+                            </td>
+                            <td class="col" colspan="2" v-if='item.outType=="散船"'>{{item.shipNumber}}</td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>车牌号</td>
+                            <td class="col col-bgc" v-if='item.outType=="火运"'>车号</td>
+                            <td class="col col-bgc" v-if='item.outType=="散船"'>船名</td>
+                            <td class="col" colspan="2" v-if='item.outType=="集装箱船"||item.outType=="汽运"||item.outType=="火运"'>{{item.carNumber}}
+                            </td>
+                            <td class="col col-bgc" >毛重检斤时间</td>
+                            <td class="col" >{{item.grossDate}}</td>
+                            <td class="col col-bgc" > 皮重检斤时间</td>
+                            <td class="col">{{item.tareDate}}</td>
                         </tr>
                     </table>
                     <div class="bottom">
@@ -260,12 +286,12 @@
                     <div class="number">{{item.number}}</div>
                     <table class="table">
                         <tr class="row">
-                            <td class="col col-bgc" >发货单位</td>
-                            <td class="col" colspan="2" >{{item.customer}}</td>
-                            <td class="col col-bgc" >联系电话</td>
-                            <td class="col" >{{item.contractManagement ? item.contractManagement.sellerPhone : ""}}</td>
-                            <td class="col col-bgc">车牌号</td>
-                            <td class="col" colspan="2">{{item.carNumber}}</td>
+                            <td class="col col-bgc">发货单位</td>
+                            <td class="col" colspan="2">{{item.customer}}</td>
+                            <td class="col col-bgc">联系电话</td>
+                            <td class="col">{{item.contractManagement ? item.contractManagement.sellerPhone : ""}}</td>
+                            <td class="col col-bgc">货名</td>
+                            <td class="col" colspan="2">{{item.goodsName}}</td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">收货单位</td>
@@ -275,8 +301,8 @@
                             <td class="col col-bgc">联系电话</td>
                             <td class="col" colspan="2">{{item.personPhone}}</td>
                         </tr>
-                        
-                        <tr class="row">
+
+                        <!-- <tr class="row">
                             <td class="col col-bgc">货名</td>
                             <td class="col">{{item.goodsName}}</td>
                             <td class="col col-bgc">类型</td>
@@ -286,9 +312,9 @@
                             </td>
                             <td class="col col-bgc">不完善粒（%）</td>
                             <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
-                            </td>
-                        </tr>
-                        <tr class="row">
+                            </td> 
+                        </tr>-->
+                        <!-- <tr class="row">
                             <td class="col col-bgc">等级</td>
                             <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
                             <td class="col col-bgc">水分（%）</td>
@@ -310,24 +336,49 @@
                             <td class="col">
                                 {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}</td>
                             <td class="col " colspan="2"></td>
-                        </tr>
+                        </tr> -->
                         <tr class="row">
-                            <td class="col col-bgc">毛重（公斤）</td>
-                            <td class="col">{{item.grossWeight}}</td>
+                            <td class="col col-bgc" >毛重（公斤）</td>
+                            <td class="col" colspan="2">{{item.grossWeight}}</td>
                             <td class="col col-bgc">皮重（公斤）</td>
                             <td class="col">{{item.tare}}</td>
-                            <td class="col col-bgc">扣重（公斤）</td>
-                            <td class="col">{{item.buckleMiscellaneous}}</td>
+                            <!-- <td class="col col-bgc">扣重（公斤）</td>
+                            <td class="col">{{item.buckleMiscellaneous}}</td> -->
                             <td class="col col-bgc">净重（公斤）</td>
                             <td class="col">{{item.netWeight}}</td>
                             <!-- <td class="col " colspan="2"></td> -->
-
                         </tr>
                         <tr class="row">
-                            <td class="col col-bgc" colspan="2">毛重检斤时间</td>
-                            <td class="col" colspan="2">{{item.grossDate}}</td>
-                            <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
-                            <td class="col" colspan="2">{{item.tareDate}}</td>
+                            <!-- <td class="col col-bgc">运输方式</td> -->
+                            <!-- <td class="col" >{{item.outType}}</td> -->
+                           
+                            <td class="col" colspan="2" v-if='item.outType=="散船"'>{{item.shipName}}</td>
+                            <td class="col col-bgc" v-if='item.outType=="火运"'>车厢号</td>
+                            <td class="col col-bgc" v-if='item.outType=="散船"'>船次</td>
+                            
+                            <td class="col col-bgc" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>封号</td>
+                            <td class="col" colspan="2" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>
+                                {{item.titleNo}}   {{item.titleNoOther}}
+                            </td>
+                            <td class="col col-bgc" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>箱号</td>
+                            <td class="col" colspan="3" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>
+                                {{item.boxNo}}       {{item.boxNoOther}}
+                            </td>
+                            <td class="col" colspan="2" v-if='item.outType=="火运"'>
+                                {{item.wingNumber}} {{item.wingNumberOther}}
+                            </td>
+                            <td class="col" colspan="2" v-if='item.outType=="散船"'>{{item.shipNumber}}</td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>车牌号</td>
+                            <td class="col col-bgc" v-if='item.outType=="火运"'>车号</td>
+                            <td class="col col-bgc" v-if='item.outType=="散船"'>船名</td>
+                            <td class="col" colspan="2" v-if='item.outType=="集装箱船"||item.outType=="汽运"||item.outType=="火运"'>{{item.carNumber}}
+                            </td>
+                            <td class="col col-bgc" >毛重检斤时间</td>
+                            <td class="col" >{{item.grossDate}}</td>
+                            <td class="col col-bgc" > 皮重检斤时间</td>
+                            <td class="col">{{item.tareDate}}</td>
                         </tr>
                     </table>
                     <div class="bottom">
@@ -368,17 +419,17 @@
                         <td class="col" colspan="2">{{_item.personPhone}}</td>
                     </tr>
                     <tr class="row">
-                        <td class="col col-bgc" >收货单位</td>
-                        <td class="col" colspan="2" >{{_item.customer}}</td>
-                        <td class="col col-bgc" >联系电话</td>
-                        <td class="col" >{{_item.contractManagement ? _item.contractManagement.sellerPhone : ""}}</td>
-                        <td class="col col-bgc">车牌号</td>
-                        <td class="col" colspan="2">{{_item.carNumber}}</td>
-                    </tr>
-                   
-                    <tr class="row">
+                        <td class="col col-bgc">收货单位</td>
+                        <td class="col" colspan="2">{{_item.customer}}</td>
+                        <td class="col col-bgc">联系电话</td>
+                        <td class="col">{{_item.contractManagement ? _item.contractManagement.sellerPhone : ""}}</td>
                         <td class="col col-bgc">货名</td>
-                        <td class="col">{{_item.goodsName}}</td>
+                        <td class="col" colspan="2">{{_item.goodsName}}</td>
+                    </tr>
+
+                    <!--  <tr class="row">
+                       <td class="col col-bgc">货名</td>
+                        <td class="col">{{_item.goodsName}}</td> 
                         <td class="col col-bgc">类型</td>
                         <td class="col">{{_item.type}}</td>
                         <td class="col col-bgc">容量（克/升）</td>
@@ -386,9 +437,9 @@
                             {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.bulkDensity:''}}</td>
                         <td class="col col-bgc">不完善粒（%）</td>
                         <td class="col">
-                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.imperfectGrain:''}}</td>
-                    </tr>
-                    <tr class="row">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.imperfectGrain:''}}</td> 
+                    </tr>-->
+                    <!-- <tr class="row">
                         <td class="col col-bgc">等级</td>
                         <td class="col">{{_item.qualityInspectionManagement?_item.qualityInspectionManagement.grade:''}}
                         </td>
@@ -414,23 +465,49 @@
                             {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.buckleMiscellaneous:''}}
                         </td>
                         <td class="col " colspan="2"></td>
-                    </tr>
+                    </tr> -->
                     <tr class="row">
-                        <td class="col col-bgc">毛重（公斤）</td>
-                        <td class="col">{{_item.grossWeight}}</td>
+                        <td class="col col-bgc" >毛重（公斤）</td>
+                        <td class="col" colspan="2">{{_item.grossWeight}}</td>
                         <td class="col col-bgc">皮重（公斤）</td>
                         <td class="col">{{_item.tare}}</td>
-                        <td class="col col-bgc">扣重（公斤）</td>
-                        <td class="col">{{_item.buckleMiscellaneous}}</td>
+                        <!-- <td class="col col-bgc">扣重（公斤）</td>
+                        <td class="col">{{_item.buckleMiscellaneous}}</td> -->
                         <td class="col col-bgc">净重（公斤）</td>
                         <td class="col">{{_item.netWeight}}</td>
-                        <td class="col " colspan="2"></td>
+                        <!-- <td class="col " colspan="2"></td> -->
                     </tr>
                     <tr class="row">
-                        <td class="col col-bgc" colspan="2">毛重检斤时间</td>
-                        <td class="col" colspan="2">{{_item.grossDate}}</td>
-                        <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
-                        <td class="col" colspan="2">{{_item.tareDate}}</td>
+                        <!-- <td class="col col-bgc">运输方式</td> -->
+                        <!-- <td class="col" >{{_item.outType}}</td> -->
+                       
+                        <td class="col" colspan="2" v-if='_item.outType=="散船"'>{{_item.shipName}}</td>
+                        <td class="col col-bgc" v-if='_item.outType=="火运"'>车厢号</td>
+                        <td class="col col-bgc" v-if='_item.outType=="散船"'>船次</td>
+                        
+                        <td class="col col-bgc" v-if='_item.outType=="集装箱船"||_item.outType=="汽运"'>封号</td>
+                        <td class="col" colspan="2" v-if='_item.outType=="集装箱船"||_item.outType=="汽运"'>
+                            {{_item.titleNo}}   {{_item.titleNoOther}}
+                        </td>
+                        <td class="col col-bgc" v-if='_item.outType=="集装箱船"||_item.outType=="汽运"'>箱号</td>
+                        <td class="col" colspan="3" v-if='_item.outType=="集装箱船"||_item.outType=="汽运"'>
+                            {{_item.boxNo}}       {{_item.boxNoOther}}
+                        </td>
+                        <td class="col" colspan="2" v-if='_item.outType=="火运"'>
+                            {{_item.wingNumber}} {{_item.wingNumberOther}}
+                        </td>
+                        <td class="col" colspan="2" v-if='_item.outType=="散船"'>{{_item.shipNumber}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc" v-if='_item.outType=="集装箱船"||_item.outType=="汽运"'>车牌号</td>
+                        <td class="col col-bgc" v-if='_item.outType=="火运"'>车号</td>
+                        <td class="col col-bgc" v-if='_item.outType=="散船"'>船名</td>
+                        <td class="col" colspan="2" v-if='_item.outType=="集装箱船"||_item.outType=="汽运"||_item.outType=="火运"'>{{_item.carNumber}}
+                        </td>
+                        <td class="col col-bgc" >毛重检斤时间</td>
+                        <td class="col" >{{_item.grossDate}}</td>
+                        <td class="col col-bgc" > 皮重检斤时间</td>
+                        <td class="col">{{_item.tareDate}}</td>
                     </tr>
                 </table>
                 <div class="bottom">
@@ -600,16 +677,25 @@
             if (_data == 'null') {
                 this.selectPrint = true;
                 this.tableData1 = JSON.parse(localStorage.getItem('selectPrint_jjSelectPrintList'))
+                console.log("this.tableData1")
+                console.log(this.tableData1)
                 if (_ew == 'true') {
                     this.tableDataEW = JSON.parse(localStorage.getItem('selectPrint_EWjjSelectPrintList'))
+                    console.log("this.tableDataEW")
+                    console.log(this.tableDataEW)
                     this.isEWPrint = true
                 }
                 if (_ewdd == 'true') {
+
                     this.tableDataEW = JSON.parse(localStorage.getItem('selectPrint_EWjjSelectPrintList'))
                     this.isDDPrint = true
+                    console.log("this.ewdd")
+                    console.log(this.tableDataEW)
                 }
             } else {
                 this.tableData = JSON.parse(_data.replace(/baifenhao/g, '%'))
+                console.log("this.tableData")
+                console.log(this.tableData)
             }
             // sessionStorage.setItem('record_print', JSON.stringify(response))
             // this.tableData = JSON.parse(sessionStorage.getItem("record_print"))

src/components/balanceAlert.vue

@@ -159,7 +159,9 @@ export default {
               this.deptBudgetList.warehouseName == '呼兰大金仓'||
               this.deptBudgetList.warehouseName == '克东润津库'||
               this.deptBudgetList.warehouseName == '洮南新友谊兴旺库'||
+              this.deptBudgetList.warehouseName == '通榆瑞祥源库'||
               this.deptBudgetList.warehouseName == '榆树民胜库'||
+              this.deptBudgetList.warehouseName == '洮南蛟流河烘干塔'||
               this.deptBudgetList.warehouseName == '克东瑞信达')
           ) {
             for (var i = 0; i < value.length; i++) {

src/views/houseSelfCollect/paymentManagement.vue

@@ -589,6 +589,7 @@
               obj.tare = v.皮重
               obj.netWeight = v.净重
               obj.dryGrainPrice = v.单价
+              obj.money = v.粮款
               obj.qualityDate = _this.formatDate(v.日期, '-')
               obj.deductionAmount = v.扣款
               obj.goodsName = v.货名

src/views/houseSelfCollect/settlement.vue

@@ -407,14 +407,20 @@
             this.paymentList.base = (100 - this.paymentList.qualityInspectionManagement.weightDeduction) / 100
             this.paymentList.base = this.paymentList.base.toFixed(3)
             if (this.paymentList.type == '潮粮') {
+              if(this.paymentList.base > 1){
+                this.paymentList.base = 1
+              }
               this.paymentList.pureWeight = this.paymentList.base * this.paymentList.weighingManagement.netWeight
               this.paymentList.pureWeight = Math.round(this.paymentList.pureWeight)
             }
 
           } else {
             if (this.paymentList.type == '潮粮') {
-              this.paymentList.pureWeight = this.paymentList.weighingManagement.netWeight * (100 - this.paymentList
-                .param) / 100
+              let paramtmp = (100 - this.paymentList.param) / 100
+              if(paramtmp > 1){
+                paramtmp = 1
+              }
+              this.paymentList.pureWeight = this.paymentList.weighingManagement.netWeight * paramtmp
               this.paymentList.pureWeight = Math.round(this.paymentList.pureWeight)
             }
           }
@@ -686,6 +692,9 @@
             .weightDeduction.toFixed(2)
           this.paymentList.base = (100 - this.paymentList.qualityInspectionManagement.weightDeduction) / 100
           this.paymentList.base = this.paymentList.base.toFixed(3)
+          if(this.paymentList.base > 1){
+            this.paymentList.base = 1
+          }
           this.paymentList.pureWeight = this.paymentList.base * this.paymentList.weighingManagement.netWeight
           this.paymentList.solidGrainPrice = (Number(this.paymentList.grainMoney) / Number(this.paymentList.pureWeight))
             .toFixed(4)

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -131,8 +131,8 @@
           </el-form-item>
 					<!--业务描述=-->
 					<el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="20">
-						<el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过150字"
-							maxlength="150" size="large" />
+						<el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过500字"
+							maxlength="500" size="large" />
 					</el-form-item>
 				</el-form>
 			</div>
@@ -256,8 +256,8 @@
           </el-form-item>
 					<!--业务描述=-->
 					<el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
-						<el-input v-model="dataList1.businessDescribe" placeholder="请输入业务描述（运输方式），不超过150字"
-							maxlength="150" size="large" />
+						<el-input v-model="dataList1.businessDescribe" placeholder="请输入业务描述（运输方式），不超过500字"
+							maxlength="500" size="large" />
 					</el-form-item>
 				</el-form>
 			</div>
@@ -362,8 +362,8 @@
           </el-form-item>
 					<!--业务描述=-->
 					<el-form-item label="业务描述">
-						<el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过150字"
-							maxlength="150" size="large" />
+						<el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过500字"
+							maxlength="500" size="large" />
 					</el-form-item>
 				</el-form>
 			</div>
@@ -995,21 +995,21 @@
 						})
 						return
 					}
-					if (
-						isNaN(this.dataList.weight) ||
-						(String(this.dataList.weight).indexOf('.') != -1 &&
-							String(this.dataList.weight).length -
-							(String(this.dataList.weight).indexOf('.') + 1) >
-							2) ||
-						this.dataList.weight < 0 ||
-						this.dataList.weight > 200000
-					) {
-						this.$message({
-							message: '重量（吨）输入有误！',
-							type: 'warning'
-						})
-						return
-					}
+					// if (
+					// 	isNaN(this.dataList.weight) ||
+					// 	(String(this.dataList.weight).indexOf('.') != -1 &&
+					// 		String(this.dataList.weight).length -
+					// 		(String(this.dataList.weight).indexOf('.') + 1) >
+					// 		2) ||
+					// 	this.dataList.weight < 0 ||
+					// 	this.dataList.weight > 200000
+					// ) {
+					// 	this.$message({
+					// 		message: '重量（吨）输入有误！',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
 					// if (!this.dataList.bulkDensity) {
 					// 	this.$message({
 					// 		message: '容重不能为空！',
@@ -1143,21 +1143,21 @@
 						})
 						return
 					}
-					if (
-						isNaN(this.dataList1.weight) ||
-						(String(this.dataList1.weight).indexOf('.') != -1 &&
-							String(this.dataList1.weight).length -
-							(String(this.dataList1.weight).indexOf('.') + 1) >
-							2) ||
-						this.dataList1.weight < 0 ||
-						this.dataList1.weight > 200000
-					) {
-						this.$message({
-							message: '重量（吨）输入有误！',
-							type: 'warning'
-						})
-						return
-					}
+					// if (
+					// 	isNaN(this.dataList1.weight) ||
+					// 	(String(this.dataList1.weight).indexOf('.') != -1 &&
+					// 		String(this.dataList1.weight).length -
+					// 		(String(this.dataList1.weight).indexOf('.') + 1) >
+					// 		2) ||
+					// 	this.dataList1.weight < 0 ||
+					// 	this.dataList1.weight > 200000
+					// ) {
+					// 	this.$message({
+					// 		message: '重量（吨）输入有误！',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
 					// if (!this.dataList1.bulkDensity) {
 					// 	this.$message({
 					// 		message: '容重不能为空！',
@@ -1301,21 +1301,21 @@
 						})
 						return
 					}
-					if (
-						isNaN(this.dataList1.weight) ||
-						(String(this.dataList1.weight).indexOf('.') != -1 &&
-							String(this.dataList1.weight).length -
-							(String(this.dataList1.weight).indexOf('.') + 1) >
-							2) ||
-						this.dataList1.weight < 0 ||
-						this.dataList1.weight > 200000
-					) {
-						this.$message({
-							message: '重量（吨）输入有误！',
-							type: 'warning'
-						})
-						return
-					}
+					// if (
+					// 	isNaN(this.dataList1.weight) ||
+					// 	(String(this.dataList1.weight).indexOf('.') != -1 &&
+					// 		String(this.dataList1.weight).length -
+					// 		(String(this.dataList1.weight).indexOf('.') + 1) >
+					// 		2) ||
+					// 	this.dataList1.weight < 0 ||
+					// 	this.dataList1.weight > 200000
+					// ) {
+					// 	this.$message({
+					// 		message: '重量（吨）输入有误！',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
 					if (!this.dataList.predictDate) {
 						this.$message({
 							message: '预计出库日期不能为空！',
@@ -1396,21 +1396,21 @@
 						})
 						return
 					}
-					if (
-						isNaN(this.dataList1.weight) ||
-						(String(this.dataList1.weight).indexOf('.') != -1 &&
-							String(this.dataList1.weight).length -
-							(String(this.dataList1.weight).indexOf('.') + 1) >
-							2) ||
-						this.dataList1.weight < 0 ||
-						this.dataList1.weight > 200000
-					) {
-						this.$message({
-							message: '重量（吨）输入有误！',
-							type: 'warning'
-						})
-						return
-					}
+					// if (
+					// 	isNaN(this.dataList1.weight) ||
+					// 	(String(this.dataList1.weight).indexOf('.') != -1 &&
+					// 		String(this.dataList1.weight).length -
+					// 		(String(this.dataList1.weight).indexOf('.') + 1) >
+					// 		2) ||
+					// 	this.dataList1.weight < 0 ||
+					// 	this.dataList1.weight > 200000
+					// ) {
+					// 	this.$message({
+					// 		message: '重量（吨）输入有误！',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
 					// if (!this.dataList1.bulkDensity) {
 					// 	this.$message({
 					// 		message: '容重不能为空！',