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

src/views/mes/md/itemtype/index.vue

@@ -103,24 +103,34 @@
     </el-table>
 
     <!-- 添加或修改物料分类对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">      
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px">      
         <el-row>
-          <el-col :span="24" v-if="form.parentTypeId !== 0">
+          <el-col :span="12" v-if="form.parentTypeId !== 0">
             <el-form-item label="父分类" prop="parentTypeId">
               <treeselect v-model="form.parentTypeId" disabled = "disabled" :options="itemTypeOptions" :normalizer="normalizer" placeholder="请选择上级分类" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="分类名称" prop="itemTypeName">
-              <el-input v-model="form.itemTypeName" placeholder="请输入分类名称" />
+              <el-input v-model="form.itemTypeName" placeholder="请输入分类名称"  disabled = "disabled"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+        </el-row>
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="显示排序" prop="orderNum">
-              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" disabled = "disabled"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="最大合单数" prop="maximumSingle">
+              <el-input-number v-model="form.maximumSingle" controls-position="right" :min="0" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="最大米数" prop="maximumMeters">
+              <el-input-number v-model="form.maximumMeters" controls-position="right" :min="0" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -139,7 +149,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="启用状态">
-              <el-radio-group v-model="form.enableFlag">
+              <el-radio-group v-model="form.enableFlag" disabled = "disabled">
                 <el-radio
                   v-for="dict in dict.type.sys_yes_no"
                   :key="dict.value"
@@ -254,6 +264,8 @@ export default {
         itemTypeName: undefined,
         orderNum: undefined,
         itemOrProduct: undefined,
+        maximumSingle: undefined,
+        maximumMeters: undefined,
         enableFlag: 'Y'
       };
       this.resetForm("form");