前端

src/views/outboundManagement/weighingManagementNew.vue

@@ -182,21 +182,21 @@
                       weighingList.outType == '集装箱船'||
                       weighingList.outType == '火运'
                     ">
-                        <ws-input v-model="weighingList.boxNo" placeholder="请输入箱号" maxlength="20" size="small" :disabled="recheck1"/>
+                        <ws-input v-model="weighingList.boxNo" placeholder="请输入箱号" maxlength="20" size="small" />
                       </ws-form-item>
                       <ws-form-item label="封号-1" span="1" prop="titleNo" v-if="
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'||
                       weighingList.outType == '火运'
                     ">
-                        <ws-input v-model="weighingList.titleNo" placeholder="请输入封号" maxlength="20" size="small" :disabled="recheck1"/>
+                        <ws-input v-model="weighingList.titleNo" placeholder="请输入封号" maxlength="20" size="small" />
                       </ws-form-item>
                       <ws-form-item label="箱号-2" span="1" prop="boxNoOther" v-if="
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'||
                       weighingList.outType == '火运'
                     ">
-                        <ws-input v-model="weighingList.boxNoOther" placeholder="请输入箱号" maxlength="20" size="small" :disabled="recheck1"/>
+                        <ws-input v-model="weighingList.boxNoOther" placeholder="请输入箱号" maxlength="20" size="small" />
                       </ws-form-item>
 
                       <ws-form-item label="封号-2" span="1" prop="titleNoOther" v-if="
@@ -204,7 +204,7 @@
                       weighingList.outType == '集装箱船'||
                       weighingList.outType == '火运'
                     ">
-                        <ws-input v-model="weighingList.titleNoOther" placeholder="请输入封号" maxlength="20" size="small" :disabled="recheck1"/>
+                        <ws-input v-model="weighingList.titleNoOther" placeholder="请输入封号" maxlength="20" size="small" />
                       </ws-form-item>
                       <!-- <ws-form-item label="车厢号-1" span="1" prop="wingNumber" v-if="weighingList.outType == '火运'">
                         <ws-input v-model="weighingList.wingNumber" placeholder="请输入车厢号" maxlength="20" size="small" />
@@ -1414,12 +1414,20 @@
 
         }
 
+      },
+      isNumber(val){
+        var regPos = /^[0-9]+.?[0-9]*/; //判断是否是数字。
+        if(regPos.test(val) ){
+            return true;
+        }else{
+            return false;
+        }
+
       },
       print() {
         this.weighingList.warehouseType = this.warehouseType
         console.log(this.weighingList,this.weighingList.binNumbe ,this.weighingList.warehouseType)
-        this.carjudge=false
-        this.carChange1 = '手动填写'
+        
         // if(this.tpyeNo==2){
         //   if(this.weighingList.qualityInspectionManagement.status != '已质检'){
         //     this.$message.error("该条信息未质检！")
@@ -1455,14 +1463,25 @@
           //   })
           //   return
           // }
-          if (!this.weighingList.contractPrice && this.weighingList.inOutType != '移库出库'
-          ||this.weighingList.inOutType == '移库出库'&&this.weighingList.priceType=='随行就市'&&this.weighingList.warehouseType==2) {
-            this.$message({
-              message: '价格不能为空',
-              type: 'warning',
-            })
-            return
+          if(this.weighingList.agreementType!='代储合同'&&this.tpyeNo == 1){
+            if (!this.weighingList.contractPrice && this.weighingList.inOutType != '移库出库'
+            ||this.weighingList.inOutType == '移库出库'&&this.weighingList.priceType=='随行就市'&&this.weighingList.warehouseType==2) {
+              this.$message({
+                message: '价格不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            console.log(this.isNumber(this.weighingList.contractPrice))
+            if(!this.isNumber(this.weighingList.contractPrice)){
+              this.$message({
+                message: '价格不能为非数字',
+                type: 'warning',
+              })
+              return
+            }
           }
+          
           if (
             this.weighingList.storageNumber&&this.weighingList.storageNumber.length < 1 ||
             this.weighingList.storageNumber&&this.weighingList.storageNumber.length > 10
@@ -1719,6 +1738,8 @@
                         // }else{
                         //   this.isShowPrintType = true
                         // }
+                        this.carjudge=false
+                        this.carChange1 = '手动填写'
                         this.weighingList = {
                           grossWeight: 0,
                           tare: 0,
@@ -2333,6 +2354,7 @@
         }
         getcontract({contractNo:this.weighingList.contractNo,warehouseName:this.warehouseName,compId:localStorage.getItem('ws-pf_compId')}).toPromise().then((response) => {
           this.outContractNo=response
+          this.weighingList.agreementType=response.agreementType
             this.shipInfoList=this.outContractNo.shipInfoList
             this.fireDirectionList=this.outContractNo.fireDirectionList
             this.weighingList.goodsName = this.outContractNo.goodsName