Merge remote-tracking branch 'origin/master'

罗广辉

82 mins ago 5f694550ed7bf0f6147c66feaa4406034ae62e54

 applications/task-work-order/src/views/orderView/appConfiguration/materials/FormDiaLog.vue

@@ -37,11 +37,11 @@
         :model="formData"
         :rules="rules"
         :disabled="dialogReadonly"
         label-width="140px"
         label-width="auto"
      >
         <el-row>
            <el-col :span="12">
               <el-form-item label="材料名称" prop="materialName">
               <el-form-item label-width="90px" label="材料名称" prop="materialName">
                  <el-input class="gd-input" v-model="formData.materialName" placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
@@ -51,7 +51,7 @@
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="必要性" prop="necessity">
               <el-form-item label-width="90px" label="必要性" prop="necessity">
                  <el-select
                     class="gd-select"
                     popper-class="gd-select-popper"
@@ -159,8 +159,8 @@

// 表单校验规则
const rules = {
   materialName: fieldRules(true),
   materialDesc: fieldRules(true),
   materialName: fieldRules(true,50),
   materialDesc: fieldRules(true,200),
   necessity: fieldRules(true),
   isAllScenario: fieldRules(true),
   areaCode: fieldRules(true),