Merge branch 'test' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into test

src/views/material/product/detail.vue

@@ -136,8 +136,8 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="净重"
-              :rules="{ required: form.measuringUnit == form.weightUnit, trigger: ['blur', 'change'] }">
+            <el-form-item label="净重" prop="netWeight"
+              :rules="{ required: form.measuringUnit == form.weightUnit, trigger: ['blur', 'change'], message: '请输入净重', }">
               <div class="form-line">
                 <el-input v-model="form.netWeight" @input="handleInput3" />
               </div>
@@ -472,7 +472,7 @@ export default {
             packingUnit: '',
             extField: {},
             measureType: 1,
-             isEnabled:1,
+            isEnabled: 1,
 
           };
           this.categorySales = {};