Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/mes/md/product/components/baseInfo.vue

@@ -20,6 +20,8 @@
             <el-input v-model="form.grossWeight" placeholder="毛重" />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>  
         <el-col :span="8">
         <el-form-item label="净重" prop="netWeight">
             <el-input v-model="form.netWeight" placeholder="净重" />
@@ -42,6 +44,8 @@
             <el-input v-model="form.volume" placeholder="体积" />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="体积单位" prop="volumeUnit">
             <el-select v-model="form.volumeUnit" placeholder="请选择体积单位">
@@ -88,6 +92,8 @@
             />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="版面" prop="layout">
             <el-select v-model="form.layout" placeholder="请选择版面">
@@ -100,7 +106,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-
           <el-col :span="8">
           <el-form-item label="有效开始日期" prop="expirationDateStart">
             <el-date-picker
@@ -126,6 +131,25 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-col :span="8">
+          <el-form-item label="是否排版">
+            <el-radio-group v-model="form.isLayout"  v-if="optType=='view'">
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+              <el-radio-group v-model="form.isLayout" v-else>
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+        </el-col>
+
     </el-form>
   </div>
 </template>
@@ -136,7 +160,7 @@ import BrandSelect from "@/components/brandSelect/single.vue";
 import SizeGroupSelect from "@/components/SizeGroupSelect/index.vue";
 export default {
   name: "BaseInfo",
-  dicts: ["product_layout","md_weight_unit","md_volumetric_unit"],
+  dicts: ["product_layout","md_weight_unit","md_volumetric_unit","sys_yes_no"],
   components: { BrandSelect, SizeGroupSelect },
   data() {
     return {