Merge branch 'master' of http://121.196.213.68:3000/xiaozhiyong/refinery-admin

src/views/product/components/add.vue

@@ -72,12 +72,14 @@
           </el-form-item>
         </template>
         <el-form-item label="计量单位" prop="measurement">
-          <el-input
+          <!-- <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-input> -->
+          <el-radio-group v-model="form.measurement">
+            <el-radio :label="'吨'">吨</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="启用状态" prop="enableMark">
           <el-radio-group v-model="form.enableMark">
@@ -113,8 +115,7 @@ export default {
     };
     return {
       form: {
-        measurement:'吨',
-        measurementEnableMark:'ENABLE'
+        measurement:'吨'
       },
       refineryList: [],
       configAutocomplete: {
@@ -210,6 +211,7 @@ export default {
     closeWindow() {
       this.$emit("closeWindow");
       this.form = {};
+      this.form.measurement = '吨'
       this.controlWindows.addInfo = {};
       this.$nextTick(() => {
         this.$refs.autocomplete.list = [];