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

 <template>
   <div>
-    <lb-table :column="InformationTable" border :key="key" :heightNum="390"  :pagination="false" heightNumSetting
-    :data="tableData">
-  </lb-table>
+    <lb-table :column="InformationTable" :maxHeight="300" heightNumSetting :pagination="false" :data="tableData">
+    </lb-table>
   </div>
 </template>
 <script>
+import { mapGetters } from 'vuex'
 export default {
-  /**注册组件*/
-  components: {},
+  computed: {
+    ...mapGetters(["dictData"]),
+  },
   data () {
     return {
-      key: 0,
-      tableData:[{
-          xm: '12',
-          zjzl: '32',
-          zjh: '123',
-          fr: "213123",
-        }],
-      InformationTable:[
-    {
+      tableData: [{
+        xm: '12',
+        zjzl: '32',
+        zjh: '123',
+        fr: "213123",
+      }],
+      InformationTable: [
+        {
           width: '60',
           renderHeader: (h, scope) => {
             return <i class="el-icon-plus pointer" onClick={() => { this.handleAdd() }} style="color:#409EFF"></i>
@@ -30,40 +30,62 @@ export default {
             )
           }
         },
-      {
-        label: '身份证读卡器',
-        align: 'center',
-        render: (h, scope) => {
-          return <el-button type="text" icon="el-icon-delete" onClick={() => { this.readClick(scope) }}>读取</el-button>
-        }
-      },
-      {
-        prop: "xm",
-        label: "姓名/名称",
-      },
-      {
-        prop: "zjzl",
-        label: "证件种类",
-      },
-      {
-        prop: "zjh",
-        label: "证件号",
-      },
-      {
-        prop: "fr",
-        label: "法人",
-      },
-      {
-        label: '操作',
-        width: '80',
-        align: 'center',
-        fixed: 'right',
-        render: (h, scope) => {
-          return <el-button type="text" icon="el-icon-delete" onClick={() => { vm.editClick(scope) }}>修改</el-button>
+        {
+          label: '身份证读卡器',
+          align: 'center',
+          render: (h, scope) => {
+            return <el-button type="text" icon="el-icon-tickets" onClick={() => { this.readClick(scope) }}>读取</el-button>
+          }
+        },
+        {
+          prop: "xm",
+          label: "姓名/名称",
+          render: (h, scope) => {
+            return (
+              <el-input placeholder="姓名/名称" value={scope.row[scope.column.property]}
+                onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
+            )
+          }
+        },
+        {
+          prop: "zjzl",
+          label: "证件种类",
+          render: (h, scope) => {
+            return (
+              <el-select value={scope.row[scope.column.property]}>
+                {
+                  this.dictData['A30'].map(option => {
+                    return (
+                      <el-option label={option.label} value={option.value}></el-option>
+                    )
+                  })
+                }
+              </el-select>
+            )
+          }
+        },
+        {
+          prop: "zjh",
+          label: "证件号",
+          render: (h, scope) => {
+            return (
+              <el-input placeholder="证件号" value={scope.row[scope.column.property]}
+                onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
+            )
+          }
+        },
+        {
+          prop: "fr",
+          label: "法人",
+          render: (h, scope) => {
+            return (
+              <el-input placeholder="法人" value={scope.row[scope.column.property]}
+                onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
+            )
+          }
         }
-      }
-    ]
-    };
+      ]
+    }
   },
   watch: {
     tableData: {
@@ -73,16 +95,15 @@ export default {
       deep: true
     }
   },
-  created(){},
-  methods:{
+  methods: {
     // 添加
     handleAdd () {
       this.tableData.push(
         {
-          xm: '22',
-          zjzl: '33',
-          zjh: '44',
-          fr: "55",
+          xm: '',
+          zjzl: '',
+          zjh: '',
+          fr: ''
         }
       )
       this.key++
@@ -92,12 +113,13 @@ export default {
       this.tableData.splice(index, 1)
     },
     // 身份证读取
-    readClick(){},
+    readClick () { },
 
     // 修改
-    editClick(){},
+    editClick () { },
   }
 }
 </script>
 <style scoped lang='scss'>
+
 </style>
\ No newline at end of file

@@ -28,7 +28,10 @@
         <ul v-if='this.isShowdrawer'>
           <p class="title">受理单元列表({{unitData.length}})</p>
           <div v-for='(item,index) in unitData' :key='index'>
-            <li @click='unitClick(item)'><p>{{item.bdcdyh}}</p><p>{{item.zl}}</p></li>
+            <li @click='unitClick(item)'>
+              <p>{{item.bdcdyh}}</p>
+              <p>{{item.zl}}</p>
+            </li>
             <div class="xian"></div>
           </div>
         </ul>
@@ -39,12 +42,12 @@
           <div class="splitScreen"></div>
         </div>
         <el-tabs v-model="activeName" @tab-click='activeClick'>
-          <el-tab-pane :label="item.name" :name="item.value" v-for="(item, index) in tabList" :key="index">
-            <div class="splitScreen-con" v-if='index == 0'>
-              <component ref='slxx' :is="editItem" :flag="flag" :key="key" />
+          <el-tab-pane :label="item.name" :name="index + 1 + ''" v-for="(item, index) in tabList" :key="index">
+            <div class="splitScreen-con">
+              <component ref='slxx' v-if='index == 0' :is="editItem" :flag="flag" :key="key" />
+              <component ref='clxx' :is="editItem" v-else-if="index == 1" :key="key" />
+              <component :is="editItem" v-else :key="key" />
             </div>
-            <component ref='clxx' :is="editItem" v-else-if="index == 1" :key="key" />
-            <component :is="editItem" v-else :key="key" />
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -64,12 +67,12 @@ export default {
   components: { zc, thDialog, zsylDialog },
   data () {
     return {
-      zsylFlag:false,
-      zcDialog:false,
-      thflag:false,
-      queryForm:{
-        bsmSlsq:"",
-        bestepid:"",
+      zsylFlag: false,
+      zcDialog: false,
+      thflag: false,
+      queryForm: {
+        bsmSlsq: "",
+        bestepid: "",
       },
       isShowdrawer: true,
       key: 0,
@@ -164,9 +167,9 @@ export default {
       editItem: '',
       issplitScreen: false,
       unitData: [],
-      taskId:"",
-      bsmBusiness:"",
-      id:"",
+      taskId: "",
+      bsmBusiness: "",
+      id: "",
     };
   },
   watch: {
@@ -208,21 +211,8 @@ export default {
         }
       })
     },
-    //获取环节扩展信息
-    expandInfo(bestepid){
-      let that = this
-      var formdata = new FormData();
-      formdata.append("bestepid", bestepid);
-      stepExpandInfo(formdata).then(res => {
-        if (res.code === 200) {
-          this.tabList1 =  [...res.result.form]
-          this.tabList = res.result.form;
-          this.headerleftList = res.result.button
-        }
-      })
-    },
-    activeClick(tab,event){
-      if(tab.name=='slxx'){
+    activeClick (tab, event) {
+      if (tab.name == '1') {
         this.list(this.id)
       }
     },
@@ -234,11 +224,11 @@ export default {
         this.$refs.slxx[0].list(item.bsmSldy)
       })
     },
-    operation (index, item) {  
-      if(item.value == 'zsyl'){
-         this.zsylFlag = true
+    operation (index, item) {
+      if (item.icon == 'fqsq3') {
+        this.zsylFlag = true
 
-      }  else if (item.value == 'clfp') {
+      } else if (item.icon == 'fqsq5') {
         this.key++
         this.issplitScreen = !this.issplitScreen
         this.flag = !this.flag
@@ -288,6 +278,16 @@ export default {
   font-size: 12px;
 }
 
+/deep/.el-tabs__content {
+  height: calc(100vh - 135px) !important;
+  overflow-y: auto !important;
+}
+
+.splitScreen-con {
+  padding: 0 15px;
+  box-sizing: border-box;
+}
+
 .fqsq {
   width: 100%;
   height: 100%;
@@ -378,7 +378,8 @@ export default {
     .tabsList-left {
       border-right: 1px solid #EBEEF5;
       position: relative;
-
+      width: 250px;
+      box-sizing: border-box;
       ul {
         position: relative;
 
@@ -427,8 +428,6 @@ export default {
 
   /deep/.el-tabs {
     width: 100%;
-    height: 90vh;
-    overflow-y: scroll;
   }
 }
 </style>
\ No newline at end of file