Compare commits

..

No commits in common. '1126906b5e6f3ff7ac32b66e426f937cbcfbf296' and '6928ce33a0767c6f3be0b82a2a84d448c599796f' have entirely different histories.

  1. 15
      src/views/product/components/add.vue
  2. 2
      src/views/product/components/adjust.vue

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

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

Loading…
Cancel
Save