Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -66,7 +66,7 @@ export default {
       key: 0,
       dialogVisible: false,
       fullscreen: false,
-      scrollerHeight: '',
+      scrollerHeight: '520px',
     }
   },
   watch: {

@@ -157,6 +157,11 @@ div:focus {
   cursor: pointer;
 }
 
+.move {
+  color: #409EFF;
+  font-size: 24px;
+}
+
 .inlineBlock {
   display: block;
 }

@@ -132,8 +132,8 @@ export default {
           render: (h, scope) => {
             return (
               <div>
-                <i class="el-icon-top pointer" disabled={scope.$index == 0} style="color:#409EFF" onClick={() => { this.moveUpward(scope.$index, scope.row) }}></i>
-                <i class="el-icon-bottom pointer" disabled={(scope.$index + 1) == this.tableData.length} style="color:#409EFF" onClick={() => { this.moveDown(scope.$index, scope.row) }}></i>
+                <i class="el-icon-top pointer move" disabled={scope.$index == 0} onClick={() => { this.moveUpward(scope.$index, scope.row) }}></i>
+                <i class="el-icon-bottom pointer move" disabled={(scope.$index + 1) == this.tableData.length} onClick={() => { this.moveDown(scope.$index, scope.row) }}></i>
               </div>
             )
           }
@@ -170,7 +170,9 @@ export default {
         }
       )
     },
-    handleMinus () { },
+    handleMinus (index, row) {
+      this.tableData.splice(index, 1)
+    },
     // 上移下移
     moveUpward (index, row) {
       upward(index, this.tableData)

@@ -127,8 +127,8 @@ export default {
           render: (h, scope) => {
             return (
               <div>
-                <i class="el-icon-top pointer" disabled={scope.$index == 0} style="color:#409EFF" onClick={() => { this.moveUpward(scope.$index, scope.row) }}></i>
-                <i class="el-icon-bottom pointer" disabled={(scope.$index + 1) == this.tableData.length} style="color:#409EFF" onClick={() => { this.moveDown(scope.$index, scope.row) }}></i>
+                <i class="el-icon-top pointer move" disabled={scope.$index == 0} onClick={() => { this.moveUpward(scope.$index, scope.row) }}></i>
+                <i class="el-icon-bottom pointer move" disabled={(scope.$index + 1) == this.tableData.length} onClick={() => { this.moveDown(scope.$index, scope.row) }}></i>
               </div>
             )
           }
@@ -170,7 +170,9 @@ export default {
         }
       )
     },
-    handleMinus () { },
+    handleMinus (index, row) {
+      this.tableData.splice(index, 1)
+    },
     // 上移下移
     moveUpward (index, row) {
       upward(index, this.tableData)

@@ -33,11 +33,11 @@
     <ul class="screen-list">
       <li v-for="(item, index) in dataList.screenList" :key="index">
         <div class="screen-list-left">
-          <el-switch v-model="item.checked">
+          <el-switch v-model="item.checked" @change="handleSelect(item)">
           </el-switch>
           {{ item.name }}
         </div>
-        <el-radio-group v-model="item.radio">
+        <el-radio-group v-model="item.radio" :disabled="!item.checked">
           <el-radio :label="1">正在办理</el-radio>
           <el-radio :label="2">未办理</el-radio>
         </el-radio-group>
@@ -123,13 +123,18 @@ export default {
     }
   },
   methods: {
+    handleSelect (item) {
+      if (!item.checked) {
+        item.radio = 0
+      }
+    },
     handleSelectall () {
-      this.qlxxList.forEach(item => {
+      this.dataList.qlxxList.forEach(item => {
         item.checked = true
       })
     },
     handleInvert () {
-      this.qlxxList.forEach(item => {
+      this.dataList.qlxxList.forEach(item => {
         item.checked = false
       })
     }

 <template>
-  <dialogBox title="申请业务规则配置" @submitForm="submitForm" isMain @closeDialog="closeDialog" v-model="value">
+  <dialogBox title="申请业务规则配置" @submitForm="submitForm" @closeDialog="closeDialog" v-model="value">
     <div class="sqywgz-edit">
       <ul class="sqywgz-edit-left">
         <li v-for="(item, index) in leftList" :key="index" :class="{ active: index == n }" @click="hanldeItem(index)">{{
@@ -287,7 +287,7 @@ export default {
       @include flex-center;
       background-color: #E4E7ED;
       border-bottom-right-radius: 5px;
-      padding: 10px 5px;
+      padding: 15px;
       cursor: pointer;
 
       &:hover {