合并分支 'fix_foton_20230103' 到 'FOTON'

Fix foton 20230103

查看合并请求 laws-foton-slrs/foton-laws-system-front!19

src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue

@@ -3264,6 +3264,10 @@ export default {
                 this.esId2 = processForm.esId2
               }
               this.taskType = processForm.type
+              this.form.DTQBBHBUSS = processForm.rqbName
+              this.form.CYBZ = processForm.esStandRelations
+              this.form.YYBZ = processForm.esMatingRelations
+              this.form.CYCD = processForm.useLevel === '29l0zgltnq' ? 'IDT等同采用' : processForm.useLevel === '9te26649ne' ? 'NEQ非等效采用': 'MOD修改采用'
               this.$http.get('lawss/activiti/judgeAcceptTack', {
                 nowEsId: this.nowEsId,
                 oaFlag:'1',

src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue

@@ -35,7 +35,7 @@
                   title="下载"
                   @click="downloadFile(item.id)"
                   class="icon-download"
-                  v-btn-permission="''"
+                  v-btn-permission="'85f32cb652c38e39c84e4507cc2955c2'"
               />
 <!--              <i-->
 <!--                  title="下载带水印"-->

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -128,13 +128,20 @@
         <div slot="right" class="right shaixuan-button">
         </div>
       </table-tools-bar>
-      <div class="action-bar">
+<!--      <div class="action-bar">-->
-        <!--        <el-button type="primary"-->
+<!--                <el-button type="primary"-->
-        <!--                   class="common-button-primary add-button"-->
+<!--                           class="common-button-primary add-button"-->
-        <!--                   @click="addModal"-->
+<!--                           @click="addModal"-->
-        <!--                   size="mini"-->
+<!--                           size="mini"-->
-        <!--                   v-btn-permission="'57f40856850c95912be0760a082db0e0'"-->
+<!--                           v-btn-permission="'57f40856850c95912be0760a082db0e0'"-->
-        <!--                   :disabled="addBtnDisabled"><i class="el-icon-plus"></i>新增</el-button>-->
+<!--                           :disabled="addBtnDisabled"><i class="el-icon-plus"></i>新增</el-button> -->
+        <div class="action-bar">
+                <el-button type="primary"
+                           class="common-button-primary add-button"
+                           @click="addModal"
+                           size="mini"
+                           v-btn-permission="'5ef028cb91c9d7376f8b6e0b18d0f879'"
+                           :disabled="addBtnDisabled"><i class="el-icon-plus"></i>新增</el-button>
         <el-button class="common-button-default in-button"
                    :loading="searching"
                    size="mini"

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -127,11 +127,18 @@
         </div>
       </table-tools-bar>
       <div class="action-bar">
+<!--        <el-button type="primary"-->
+<!--                   class="common-button-primary add-button"-->
+<!--                   size="mini"-->
+<!--                   @click="addModal"-->
+<!--                   v-btn-permission="'ceb5fb1e00'"-->
+<!--                   :disabled="addBtnDisabled"><i class="el-icon-plus"></i>新增-->
+<!--        </el-button>-->
         <el-button type="primary"
                    class="common-button-primary add-button"
                    size="mini"
                    @click="addModal"
-                   v-btn-permission="'ceb5fb1e00'"
+                   v-btn-permission="'06072e03642198d3ffeec6fad79061dd'"
                    :disabled="addBtnDisabled"><i class="el-icon-plus"></i>新增
         </el-button>
         <el-button class="common-button-default in-button"
@@ -1176,7 +1183,7 @@
 <!--                    </el-form-item>-->
 <!--                  </template>-->
                   <!-- 去掉模块结构单元 -->
-                  <template v-else-if="['DYBXH','DYMC','DYBXHCAR','DYMCCAR'].includes(field.attrField)">
+                  <template v-else-if="!['DYBXH','DYMC','DYBXHCAR','DYMCCAR'].includes(field.attrField)">
                     <custom-input
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"