UI界面变更-项目详情-法规清单

jero-web/src/components/globalAdvancedQuery/index.vue

@@ -11,7 +11,7 @@
           <a @click="handleReset">{{$t('empty')}}</a>
         </template>
         <a-button-group>
-          <a-button type="primary" @click="handleOpen" style="margin-right: 8px;height: 38px">
+          <a-button type="primary" @click="handleOpen" style="height: 38px":style='`marginRight:${MarginRight?MarginRight:"8px"}`'>
 <!--            <a-icon type="appstore" theme="twoTone" spin/>-->
             <a-icon type="filter" theme="filled"/>
             <span>{{$t('advancedQuery')}}</span>
@@ -19,7 +19,7 @@
           <a-button style="margin-right: 8px;height: 38px" v-if="izMobile" type="primary" icon="delete" @click="handleReset"/>
         </a-button-group>
       </a-tooltip>
-      <a-button v-else style="margin-right: 8px;height: 38px" type="primary" icon="filter" @click="handleOpen">{{$t('advancedQuery')}}</a-button>
+      <a-button v-else style="height: 38px" type="primary" icon="filter" @click="handleOpen" :style='`marginRight:${MarginRight?MarginRight:"8px"}`'>{{$t('advancedQuery')}}</a-button>
     </slot>
   <j-modal
     :title="$t('advancedQuery')"
@@ -264,6 +264,10 @@
     mixins: [mixinDevice],
     components: { JAreaLinkage, JMultiSelectTag, JDate, JSelectDepart, JSelectMultiUser ,PersonnelSelection},
     props: {
+      MarginRight:{
+        type:String,
+        required:false
+      },
       /*
        fieldList: [{
           value:'',