Merge remote-tracking branch 'origin/develop' into develop

2022-04-22 09:28:48 +08:00
parent 22373238c1 17ee404ab5
commit 5e126d0ab2
18 changed files with 292 additions and 101 deletions
@@ -529,6 +529,7 @@
                ></custom-date-pick>
                <!--</el-form-item>-->
                <el-form-item
+                  style="display: none"
                  prop="isRelateAccess"
                  label-width="150px"
                  class="add-form-item"
@@ -862,7 +863,7 @@
                    </el-form-item>
                  </template>
                  <!--                  全选-->
-                  <template v-else>
+                  <template v-else-if="field.attrField !== 'SYRZ'">
                    <custom-select-array
                      :config="field"
                      v-model="sarStandardsInfoEO[field.attrField]"