xiugai

Reviewed-on: #6

src/views/product/components/add.vue

@@ -75,7 +75,9 @@
           <el-input
             v-model="form.measurement"
             placeholder="请输入计量单位"
+            disabled
           ></el-input>
+          <el-radio v-model="form.measurementEnableMark"  label="ENABLE" style="margin-left:10px">启用</el-radio>
         </el-form-item>
         <el-form-item label="启用状态" prop="enableMark">
           <el-radio-group v-model="form.enableMark">
@@ -110,7 +112,10 @@ export default {
       else callback("请选择炼厂");
     };
     return {
-      form: {},
+      form: {
+        measurement:'吨',
+        measurementEnableMark:'ENABLE'
+      },
       refineryList: [],
       configAutocomplete: {
         serveTarget: refineryInfoServe.findByEntity,
@@ -128,19 +133,19 @@ export default {
       productTypeList: [
         {
           label: "0#柴",
-          value: "0#",
+          value: "0#柴",
         },
         {
           label: "-10#柴",
-          value: "-10#",
+          value: "-10#柴",
         },
         {
           label: "92#汽",
-          value: "92#",
+          value: "92#汽",
         },
         {
           label: "95#汽",
-          value: "95#",
+          value: "95#汽",
         },
       ],
       rules: {

src/views/product/components/adjust.vue

@@ -47,7 +47,7 @@ export default {
     };
     let validatorSalePrice2company = (rule, value, callback) => {
       if (!value || !+value) return callback("企业销售价不能为0或空");
-      if (value < this.form.floorPrice)
+      if (+value < this.form.floorPrice)
         return callback("企业销售价不能低于成本价");
       callback();
     };