Merge remote-tracking branch 'origin/master'

@@ -65,7 +65,7 @@ export default {
         },
         },
         {
         {
           label: '是否必填',
           label: '是否必填',
-          width: '100',
+          width: '130',
           render: (h, scope) => {
           render: (h, scope) => {
             return (
             return (
               <el-radio-group v-model={scope.row.isrequired} onChange={(val) => { scope.row[scope.column.property] = val }}>
               <el-radio-group v-model={scope.row.isrequired} onChange={(val) => { scope.row[scope.column.property] = val }}>

@@ -320,7 +320,7 @@ export default {
 @import "~@/styles/mixin.scss";
 @import "~@/styles/mixin.scss";
 
 
 /deep/.el-radio {
 /deep/.el-radio {
-  margin-right: 8px;
+  margin-right: 0;
 }
 }
 
 
 /deep/.el-radio__label {
 /deep/.el-radio__label {

 <template>
 <template>
-  <el-dialog :title="sqqlRule.nodename" custom-class="dialogBox contentCenter" width="85%" top="0"
+  <el-dialog :title="sqqlRule.nodename" custom-class="dialogBox contentCenter" width="80%" top="0"
     :visible.sync="dialogVisible" :before-close="cancelDialog">
     :visible.sync="dialogVisible" :before-close="cancelDialog">
     <ul class="edit-title-list" v-if="djlxList.length > 0">
     <ul class="edit-title-list" v-if="djlxList.length > 0">
       <li v-for="(item, index) in djlxList" @click="handleTitleSelct(item, index)" :key="index"
       <li v-for="(item, index) in djlxList" @click="handleTitleSelct(item, index)" :key="index"
@@ -205,7 +205,7 @@ export default {
         },
         },
         {
         {
           label: '是否启用登记情形',
           label: '是否启用登记情形',
-          width: '140',
+          width: '141',
           render: (h, scope) => {
           render: (h, scope) => {
             return (
             return (
               <el-radio-group v-model={scope.row.enabled} disabled={scope.row.sftsdjqx == '1'} onChange={(val) => { scope.row[scope.column.property] = val }}>
               <el-radio-group v-model={scope.row.enabled} disabled={scope.row.sftsdjqx == '1'} onChange={(val) => { scope.row[scope.column.property] = val }}>
@@ -324,7 +324,7 @@ export default {
         },
         },
         {
         {
           label: '是否公共材料',
           label: '是否公共材料',
-          width: '100',
+          width: '110',
           render: (h, scope) => {
           render: (h, scope) => {
             return (
             return (
               <el-radio-group v-model={scope.row.sfggcl} onChange={(val) => { scope.row[scope.column.property] = val; this.handleSelectGgcl(scope.row) }}>
               <el-radio-group v-model={scope.row.sfggcl} onChange={(val) => { scope.row[scope.column.property] = val; this.handleSelectGgcl(scope.row) }}>
@@ -428,6 +428,10 @@ export default {
   overflow-y: scroll;
   overflow-y: scroll;
 }
 }
 
 
+.el-radio-group {
+  white-space: nowrap;
+}
+
 .form {
 .form {
   background: #eee;
   background: #eee;
   padding: 0 10px;
   padding: 0 10px;