冲突解决2

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

@@ -162,7 +162,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="10">
+            <el-col :span="12">
               <el-form-item label="是否启用" label-width="100px" prop="enableFlag">
                 <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
                   <el-radio
@@ -183,13 +183,13 @@
           </el-row>
         </el-row>
         <el-row>
-          <el-col :span="10">
+          <el-col :span="12">
             <el-form-item label="尺码组编码" label-width="100px" prop="sizeGroupCode">
               <el-input v-model="form.sizeGroupCode" readonly="readonly" v-if="optType == 'view'"/>
               <el-input v-model="form.sizeGroupCode" placeholder="请输入尺码组编码" v-else/>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="12">
             <el-form-item label="尺码组名称" label-width="100px" prop="sizeGroupName">
               <el-input v-model="form.sizeGroupName" readonly="readonly" v-if="optType=='view'"/>
               <el-input v-model="form.sizeGroupName" placeholder="请输入尺码组名称" v-else/>

src/views/mes/tm/toolrequest/selectTask.vue

@@ -192,7 +192,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "MdItemSingle",
-  dicts: ["sys_yes_no", "mes_item_product"],
+  dicts: ["TASK_STATUS"],
   components: { Treeselect },
   data() {
     return {