Merge pull request '12312' (#9) from caolc into master

Reviewed-on: #9

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>

src/views/product/components/create.vue

@@ -87,7 +87,7 @@
           ></el-input>
           元/吨
         </el-form-item>
-        <el-form-item prop="preQuantity" label="预约提货量">
+        <el-form-item label="预约提货量">
           <el-input
             maxlength="50"
             v-model="form.preQuantity"
@@ -155,13 +155,6 @@ export default {
       if (this.form.refineryId) callback();
       else callback("请选择炼厂");
     };
-    var validatePass = (rule, value, callback) => {
-        if (value==''||Number(value)<=0) {
-          callback(new Error('预约提货量不能为空或零'));
-        } else {
-          callback();
-        }
-      };
     return {
       customList: [],
       form: {
@@ -198,9 +191,6 @@ export default {
         enableMark: [
           { required: true, message: "请选择启用状态", trigger: "change" },
         ],
-        preQuantity:[
-        { required: true, validator:validatePass, trigger: "blur" }
-        ],
         productType: [
           { required: true, message: "请选择产品类型", trigger: "change" },
         ],

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>