From f56dc7bde9c0c81bc9fd4c7eb36ba2fe8e886041 Mon Sep 17 00:00:00 2001
From: caolc <572275724@qq.com>
Date: Tue, 4 Apr 2023 11:16:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E8=B4=A7=E5=8D=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/components/billOfLading.vue          |  2 +-
 src/views/product/components/create.vue              | 12 +++++++++++-
 src/views/product/index.vue                          |  2 +-
 src/views/refineryCenter/components/billOfLading.vue |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/views/order/components/billOfLading.vue b/src/views/order/components/billOfLading.vue
index fa0c4f0..4e64fed 100644
--- a/src/views/order/components/billOfLading.vue
+++ b/src/views/order/components/billOfLading.vue
@@ -110,7 +110,7 @@
     <el-dialog :close-on-click-modal="false" :append-to-body="true" title="提货单信息" width="400px" :visible.sync="dialogBillAdd">
       <el-form v-if="dialogBillAdd" :model="billAddData" ref="form" :rules="rules">
         <el-form-item label="预约提货量" prop="preDeliveryQuantity">
-          <el-input v-model="billAddData.preDeliveryQuantity"></el-input>元/吨
+          <el-input v-model="billAddData.preDeliveryQuantity"></el-input>吨
         </el-form-item>
         <el-form-item label="提货人" prop="driverName">
           <el-input v-model="billAddData.driverName"></el-input>
diff --git a/src/views/product/components/create.vue b/src/views/product/components/create.vue
index 7d8fda4..34d71e0 100644
--- a/src/views/product/components/create.vue
+++ b/src/views/product/components/create.vue
@@ -87,7 +87,7 @@
           ></el-input>
           元/吨
         </el-form-item>
-        <el-form-item label="预约提货量">
+        <el-form-item prop="preQuantity" label="预约提货量">
           <el-input
             maxlength="50"
             v-model="form.preQuantity"
@@ -155,6 +155,13 @@ export default {
       if (this.form.refineryId) callback();
       else callback("请选择炼厂");
     };
+    var validatePass = (rule, value, callback) => {
+        if (!Boolean(Number(value))) {
+          callback(new Error('预约提货量不能为空或零'));
+        } else {
+          callback();
+        }
+      };
     return {
       customList: [],
       form: {
@@ -191,6 +198,9 @@ export default {
         enableMark: [
           { required: true, message: "请选择启用状态", trigger: "change" },
         ],
+        preQuantity:[
+        { required: true, validator:validatePass, trigger: "blur" }
+        ],
         productType: [
           { required: true, message: "请选择产品类型", trigger: "change" },
         ],
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index e58a29a..df58639 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -174,7 +174,7 @@
     <!--新增产品  -->
     <add :controlWindows="controlWindows" @closeWindow="search" />
     <!-- 下单 -->
-    <create :controlWindows="controlWindows" @closeWindow="search" />
+    <create  :controlWindows="controlWindows" @closeWindow="search" />
     <!-- 调价记录 -->
     <record :controlWindows="controlWindows" />
     <!-- 批量 -->
diff --git a/src/views/refineryCenter/components/billOfLading.vue b/src/views/refineryCenter/components/billOfLading.vue
index 25a3ace..42247d7 100644
--- a/src/views/refineryCenter/components/billOfLading.vue
+++ b/src/views/refineryCenter/components/billOfLading.vue
@@ -110,7 +110,7 @@
     <el-dialog :close-on-click-modal="false" :append-to-body="true" title="提货单信息" width="400px" :visible.sync="dialogBillAdd">
       <el-form v-if="dialogBillAdd" :model="billAddData" ref="form" :rules="rules">
         <el-form-item label="预约提货量" prop="preDeliveryQuantity">
-          <el-input v-model="billAddData.preDeliveryQuantity"></el-input>元/吨
+          <el-input v-model="billAddData.preDeliveryQuantity"></el-input>吨
         </el-form-item>
         <el-form-item label="提货人" prop="driverName">
           <el-input v-model="billAddData.driverName"></el-input>
-- 
2.36.2