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

src/components/CustomFormComponents/DatePickerGroup.vue

@@ -45,6 +45,7 @@
             type="primary"
             plain
             size="mini"
+            :disabled="disabled"
             @click="handleAddDate">增加日期</el-button>
         </div>
       </div>

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -115,6 +115,7 @@
                 :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
                 :config="{attrName: '引用标准'}"
                 :labelWidth="'150px'"
+                :disabled="disabledXX"
                 v-model="qbfsForm.esMatingRelations"
               ></custom-input-for-all-standards2>
             </template>
@@ -190,6 +191,7 @@
                 :config="{attrName: '采用标准'}"
                 :labelWidth="'180px'"
                 v-model="qbfsForm.esStandRelations"
+                :disabled="disabledXX"
               ></custom-input-for-all-standards2>
             </template>
             <el-form-item label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">

src/pages/processCenter/pages/creatProcess/zcrk/step1.vue

@@ -149,8 +149,8 @@
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
                                     <el-radio-group v-model="form.isRelateAccess">
-                                        <el-radio label="1">是</el-radio>
-                                        <el-radio label="2">否</el-radio>
+                                        <el-radio :disabled="disabledXX"  label="1">是</el-radio>
+                                        <el-radio :disabled="disabledXX"  label="2">否</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" label="年度" prop="lawsYear" class="add-form-item form-item-disabled">
@@ -205,7 +205,7 @@
                                 <cus-tom-data-picker-group
                                         :config="{attrName:'实施日期(标准文本)',attrField:'SSRQLAWS'}"
                                         v-model="form.SSRQLAWS"
-                                        :disabled="false"
+                                        :disabled="disabledXX"
                                 ></cus-tom-data-picker-group>
 <!--                                <el-form-item label="实施日期(标准文本)" prop="SSRQLAWS" class="add-form-item form-item-disabled">-->
 <!--                                    <el-date-picker :disabled="disabledXX"-->
@@ -216,9 +216,9 @@
 <!--                                    </el-date-picker>-->
 <!--                                </el-form-item>-->
                                 <cus-tom-data-picker-group
-                                        :config="{attrName:'请选择在产车实施日期(标准文本)',attrField:'ZCXSSRQLAWS'}"
+                                        :config="{attrName:'在产车实施日期(标准文本)',attrField:'ZCXSSRQLAWS'}"
                                         v-model="form.ZCXSSRQLAWS"
-                                        :disabled="false"
+                                        :disabled="disabledXX"
                                 ></cus-tom-data-picker-group>
 <!--                                <el-form-item label="在产车实施日期(标准文本)" prop="ZCXSSRQLAWS" class="add-form-item form-item-disabled">-->
 <!--                                    <el-date-picker :disabled="disabledXX"-->
@@ -231,9 +231,9 @@
                             </el-col>
                             <el-col :span="12">
                                 <cus-tom-data-picker-group
-                                        :config="{attrName:'请选择新车型实施日期(标准文本)',attrField:'XCXSSRQLAWS'}"
+                                        :config="{attrName:'新车型实施日期(标准文本)',attrField:'XCXSSRQLAWS'}"
                                         v-model="form.XCXSSRQLAWS"
-                                        :disabled="false"
+                                        :disabled="disabledXX"
                                 ></cus-tom-data-picker-group>
 <!--                                <el-form-item label="新车型实施日期(标准文本)" prop="XCXSSRQLAWS" class="add-form-item form-item-disabled">-->
 <!--                                    <el-date-picker :disabled="disabledXX"-->