gjy 3 years ago
parent
commit
5ee0d30ff1

+ 1 - 32
src/views/warehouse/warehouseManagementDelivery.vue

@@ -145,16 +145,6 @@
               size="small"
             />
           </ws-form-item>
-          <!--净重(吨)-->
-          <ws-form-item label="扣款" span="1" prop="deductionAmount">
-            <ws-input
-              v-model="deptBudgetList.deductionAmount"
-              type="number" @mousewheel.native.prevent
-              placeholder="请输入扣款金额"
-              maxlength="120"
-              size="small"
-            />
-          </ws-form-item>
           <!-- 品级 -->
           <ws-form-item label="品级" span="1" class="readonly">
             <ws-select
@@ -243,7 +233,7 @@
             ><el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
           <div>
-            <img style='width:100px;height:100px;' :src="deptBudgetList.addressUrl" alt="">
+            <img v-if='deptBudgetList.addressUrl' style='width:100px;height:100px;' :src="deptBudgetList.addressUrl" alt="">
           </div>
       <div class="small-title">化验数据(选填)</div>
       <div class="inspector">
@@ -940,27 +930,6 @@ export default {
         })
         return
       }
-      if (!this.deptBudgetList.deductionAmount) {
-        this.$message({
-          message: '扣款不能为空',
-          type: 'warning'
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.deductionAmount < 0 ||
-        this.deptBudgetList.deductionAmount > 10000 ||
-        (String(this.deptBudgetList.deductionAmount).indexOf('.') != -1 &&
-          String(this.deptBudgetList.deductionAmount).length -
-            (String(this.deptBudgetList.deductionAmount).indexOf('.') + 1) >
-            2)
-      ) {
-        this.$message({
-          message: '扣款输入错误',
-          type: 'warning'
-        })
-        return
-      }
 
       if (!this.deptBudgetList.agent) {
         this.$message({

+ 0 - 30
src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -138,15 +138,6 @@
               size="small"
             />
           </ws-form-item>
-          <!--净重(吨)-->
-          <ws-form-item label="扣款" span="1" prop="deductionAmount">
-            <ws-input
-              v-model="dataList.deductionAmount"
-              placeholder="请输入扣款金额"
-              maxlength="120"
-              size="small"
-            />
-          </ws-form-item>
           <!-- 品级 -->
           <ws-form-item label="品级" span="1" class="readonly">
             <ws-select
@@ -667,27 +658,6 @@ export default {
         })
         return
       }
-      if (!this.dataList.deductionAmount) {
-        this.$message({
-          message: '扣款不能为空',
-          type: 'warning'
-        })
-        return
-      }
-      if (
-        this.dataList.deductionAmount < 0 ||
-        this.dataList.deductionAmount > 10000 ||
-        (String(this.dataList.deductionAmount).indexOf('.') != -1 &&
-          String(this.dataList.deductionAmount).length -
-            (String(this.dataList.deductionAmount).indexOf('.') + 1) >
-            2)
-      ) {
-        this.$message({
-          message: '扣款输入错误',
-          type: 'warning'
-        })
-        return
-      }
       if (!this.dataList.agent) {
         this.$message({
           message: '经办人不能为空',