ccjgmwz 3 years ago
parent
commit
587ef4eaa4

+ 3 - 3
src/views/contractManagement/salesContract.vue

@@ -219,13 +219,13 @@
             "
             alt=""
           />
-          <div
+          <!-- <div
             v-if="
               (scope.row.approveStatus != '待决策人审核' &&
                 scope.row.approveStatus)
             "
             style="display: inline-block"
-          >
+          > -->
             <img
               width="17"
               height="16"
@@ -237,7 +237,7 @@
               @click="handleEdit(scope.row)"
               alt=""
             />
-          </div>
+          <!-- </div> -->
 
           <img
             width="16"

+ 5 - 5
src/views/warehouse/warehouseManagementGross.vue

@@ -680,7 +680,7 @@
           return
         }
         if (
-          this.deptBudgetList.grossWeight < 0 ||
+          this.deptBudgetList.grossWeight < 100 ||
           this.deptBudgetList.grossWeight > 500000 ||
           (String(this.deptBudgetList.grossWeight).indexOf('.') != -1 &&
             String(this.deptBudgetList.grossWeight).length -
@@ -688,7 +688,7 @@
             3)
         ) {
           this.$message({
-            message: '毛重输入错误',
+            message: '毛重输入错误(单位:公斤)',
             type: 'warning',
           })
           return
@@ -701,7 +701,7 @@
           return
         }
         if (
-          this.deptBudgetList.tare < 0 ||
+          this.deptBudgetList.tare < 100 ||
           this.deptBudgetList.tare > 5000000 ||
           (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
             String(this.deptBudgetList.tare).length -
@@ -709,7 +709,7 @@
             3)
         ) {
           this.$message({
-            message: '皮重输入错误',
+            message: '皮重输入错误(单位:公斤)',
             type: 'warning',
           })
           return
@@ -723,7 +723,7 @@
         }
         if (
           this.deptBudgetList.deductionWeight < 0 ||
-          this.deptBudgetList.deductionWeight > 10 ||
+          this.deptBudgetList.deductionWeight > 1000 ||
           (String(this.deptBudgetList.deductionWeight).indexOf('.') != -1 &&
             String(this.deptBudgetList.deductionWeight).length -
             (String(this.deptBudgetList.deductionWeight).indexOf('.') + 1) >