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

@@ -26,8 +26,8 @@
         <b class="title">权利人</b>
         <personInfoTable @getInfoList="handleGetQlList" :dataList="qldataList" />
         <div class="submit-button">        
-          <el-button type="primary" @click="queryChick">查询</el-button>
           <el-button @click="resetClick">重置</el-button>
+          <el-button type="primary" @click="queryChick">查询</el-button>
         </div>
         <b class="title" v-show="isSearch">查询结果</b>
         <lb-table :column="searchData.columns" v-if="isSearch" :data="searchData.data" :maxHeight="200" heightNumSetting
@@ -89,8 +89,8 @@ export default {
 
       addJtfc: {
         djSqcxDO: {},
-        sqxx: [],
-        qlrxx: [],
+        sqrList: [],
+        qlrList: [],
       }
     }
   },
@@ -99,16 +99,16 @@ export default {
       this.myValue = val
       this.qldataList = _.cloneDeep(this.dataList)
       this.sqdataList = _.cloneDeep(this.dataList)
-      this.addJtfc.sqxx = _.cloneDeep(this.dataList)
-      this.addJtfc.qlrxx = _.cloneDeep(this.dataList)
+      this.addJtfc.sqrList = _.cloneDeep(this.dataList)
+      this.addJtfc.qlrList = _.cloneDeep(this.dataList)
     },
     'ruleForm.ycyrgx' (val) {
       if (val != 1) {
         this.qldataList = _.cloneDeep(this.dataList)
-        this.addJtfc.qlrxx = _.cloneDeep(this.dataList)
+        this.addJtfc.qlrList = _.cloneDeep(this.dataList)
       } else {
-        this.qldataList = this.addJtfc.sqxx
-        this.addJtfc.qlrxx = this.addJtfc.sqxx
+        this.qldataList = this.addJtfc.sqrList
+        this.addJtfc.qlrList = this.addJtfc.sqrList
       }
     }
   },
@@ -119,20 +119,19 @@ export default {
     handleGetSqList (val) {
       if (!_.isEqual(val, this.dataList) && this.ruleForm.ycyrgx == 1) {
         this.qldataList = val
-        this.addJtfc.qlrxx = val
+        this.addJtfc.qlrList = val
       } else
-        this.addJtfc.sqxx = val
+        this.addJtfc.sqrList = val
     },
     handleGetQlList (val) {
       if (this.ruleForm.ycyrgx != 1) {
-        this.addJtfc.qlrxx = val
+        this.addJtfc.qlrList = val
       }
     },
     queryChick () {
       this.addJtfc.djSqcxDO = { ...this.ruleForm }
       addJtfcCxjgXx(this.addJtfc).then(res => {
         this.searchData.data = res.result;
-        console.log(res);
         this.isSearch = true
       })
     },

@@ -16,7 +16,17 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="14" class="btnColRight">
+           <el-col :span="10">
+            <el-form-item label="查询时间">
+             <el-date-picker v-model="queryForm.sqr" :picker-options="pickerOptionsStart" type="date"
+                placeholder="开始日期" value-format="yyyy-MM-dd" clearable>
+              </el-date-picker> 至
+               <el-date-picker v-model="queryForm.sqr" :picker-options="pickerOptionsStart" type="date"
+                placeholder="结束日期" value-format="yyyy-MM-dd" clearable>
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="btnColRight">
             <el-button type="primary" native-type="submit" @click="queryClick()">查询</el-button>
             <el-button type="primary" @click="handleAdd">新增</el-button>
           </el-col>

@@ -8,16 +8,16 @@ class data extends filter {
   constructor() {
     super()
   }
-  djqxCol () {
+  djqxCol() {
     return [
       {
         width: '60',
         renderHeader: (h, scope) => {
-          return <i class="el-icon-plus pointer" onClick={() => { vm.handleAdd() }} style="color:#409EFF"></i>
+          return <i class="el-icon-plus pointer" onClick={() => { vm.addDjqx() }} style="color:#409EFF"></i>
         },
         render: (h, scope) => {
           return (
-            <i class="el-icon-minus pointer" onClick={() => { vm.handleMinus(scope.$index, scope.row) }}></i>
+            <i class="el-icon-minus pointer" onClick={() => { vm.removeDjqx(scope.$index, scope.row) }}></i>
           )
         }
       },
@@ -27,14 +27,26 @@ class data extends filter {
         type: 'index'
       },
       {
+        label: '是否启用登记情形',
+        prop: 'enabled',
+        width: '141',
+        render: (h, scope) => {
+          return (
+            <el-radio-group value={scope.row[scope.column.property]} onInput={(val) => { scope.row[scope.column.property] = val }}>
+              <el-radio label={'1'}>启用</el-radio>
+              <el-radio label={'0'}>禁用</el-radio>
+            </el-radio-group>
+          )
+        }
+      },
+      {
         prop: 'nodecode',
         width: '105',
         label: '登记情形编码',
         render: (h, scope) => {
           return (
             <div>
-              <el-input placeholder="登记情形编码" class={{ repeat: scope.row.repeat }} disabled={scope.row.sftsdjqx == '1'}
-                value={scope.row[scope.column.property]}
+              <el-input placeholder="登记情形编码" class={{ repeat: scope.row.repeat }} value={scope.row[scope.column.property]}
                 onInput={(val) => { scope.row[scope.column.property] = val }} onBlur={() => { vm.nodecodeBlur(scope.$index, scope.row) }} maxlength="8">
               </el-input>
             </div>
@@ -47,19 +59,18 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-input placeholder="登记情形名称" disabled={scope.row.sftsdjqx == '1'}
-                value={scope.row[scope.column.property]}
-                onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
+              <el-input placeholder="登记情形名称" value={scope.row[scope.column.property]} onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
             </div>
           )
         }
       },
       {
-        label: '是否启用登记情形',
-        width: '141',
+        prop: 'sfqydjyymb',
+        label: '是否启用模板',
+        width: '140',
         render: (h, scope) => {
           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 value={scope.row[scope.column.property]} onInput={(val) => { scope.row[scope.column.property] = val }}>
               <el-radio label={'1'}>启用</el-radio>
               <el-radio label={'0'}>禁用</el-radio>
             </el-radio-group>
@@ -72,26 +83,13 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-input placeholder="登记原因模板" disabled={scope.row.sftsdjqx == '1'} value={scope.row[scope.column.property]}
-                onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
+              <el-input placeholder="登记原因模板" value={scope.row[scope.column.property]} onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
             </div>
 
           )
         }
       },
       {
-        label: '是否启用模板',
-        width: '140',
-        render: (h, scope) => {
-          return (
-            <el-radio-group v-model={scope.row.sfqydjyymb} disabled={scope.row.sftsdjqx == '1'} onChange={(val) => { scope.row[scope.column.property] = val }}>
-              <el-radio label={'1'}>启用</el-radio>
-              <el-radio label={'0'}>禁用</el-radio>
-            </el-radio-group>
-          )
-        }
-      },
-      {
         label: '移动',
         width: '100',
         render: (h, scope) => {
@@ -106,16 +104,16 @@ class data extends filter {
     ]
   }
 
-  clxxCol () {
+  clxxCol() {
     return [
       {
         width: '60',
         renderHeader: (h, scope) => {
-          return <i class="el-icon-plus pointer" onClick={() => { vm.handleAdd() }} style="color:#409EFF"></i>
+          return <i class="el-icon-plus pointer" onClick={() => { vm.addClxx() }} style="color:#409EFF"></i>
         },
         render: (h, scope) => {
           return (
-            <i class="el-icon-minus pointer" onClick={() => { vm.handleMinus(scope.$index, scope.row) }}></i>
+            <i class="el-icon-minus pointer" onClick={() => { vm.removeClxx(scope.$index, scope.row) }}></i>
           )
         }
       },
@@ -181,10 +179,11 @@ class data extends filter {
       },
       {
         label: '是否公共材料',
+        prop: 'sfggcl',
         width: '110',
         render: (h, scope) => {
           return (
-            <el-radio-group v-model={scope.row.sfggcl} onChange={(val) => { scope.row[scope.column.property] = val; vm.handleSelectGgcl(scope.row) }}>
+            <el-radio-group value={scope.row[scope.column.property]} onInput={(val) => { scope.row[scope.column.property] = val }}>
               <el-radio label={'1'}>是</el-radio>
               <el-radio label={'0'}>否</el-radio>
             </el-radio-group>

 <template>
-  <el-dialog :title="sqqlRule.nodename" custom-class="dialogBox contentCenter" width="80%" top="0"
-    :visible.sync="dialogVisible" :before-close="cancelDialog">
+  <el-dialog
+    :title="sqqlRule.nodename"
+    custom-class="dialogBox contentCenter"
+    width="80%"
+    top="0"
+    :visible.sync="dialogVisible"
+    :before-close="cancelDialog"
+  >
     <ul class="edit-title-list" v-if="djlxList.length > 0">
-      <li v-for="(item, index) in djlxList" @click="handleTitleSelct(item, index)" :key="index"
-        :class="{ active: index == tn }">
+      <li
+        v-for="(item, index) in djlxList"
+        @click="handleTitleSelct(item, index)"
+        :key="index"
+        :class="{ active: index == tn }"
+      >
         {{ item.nodename }}
       </li>
     </ul>
@@ -12,8 +22,18 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="申请分类">
-              <el-select v-model="form.ywDetail.sqfl" disabled placeholder="请选择" class="width100">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+              <el-select
+                v-model="form.ywDetail.sqfl"
+                disabled
+                placeholder="请选择"
+                class="width100"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -32,8 +52,18 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="发起业务单元类型">
-              <el-select v-model="form.ywDetail.fqywdylx" disabled placeholder="请选择" class="width100">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+              <el-select
+                v-model="form.ywDetail.fqywdylx"
+                disabled
+                placeholder="请选择"
+                class="width100"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -64,20 +94,42 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="登记情形及材料">
-              <el-input v-model="form.ywDetail.djqxcl" placeholder="仅支持execl文件导入"></el-input>
+              <el-input
+                v-model="form.ywDetail.djqxcl"
+                placeholder="仅支持execl文件导入"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="1">
-            <el-upload ref="upload" :action="imgUploadUrl" :limit="1" accept=".xls, .xlsx" :show-file-list="false"
-              :disabled="requested" :file-list="fileList" :before-upload="uploadRecord" :on-success="handleSuccess">
-              <el-button type="primary" icon="el-icon-upload" :loading="requested">上传材料</el-button>
+            <el-upload
+              ref="upload"
+              :action="imgUploadUrl"
+              :limit="1"
+              accept=".xls, .xlsx"
+              :show-file-list="false"
+              :disabled="requested"
+              :file-list="fileList"
+              :before-upload="uploadRecord"
+              :on-success="handleSuccess"
+            >
+              <el-button
+                type="primary"
+                icon="el-icon-upload"
+                :loading="requested"
+                >上传材料</el-button
+              >
             </el-upload>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="登记原因模板" prop="djyy">
-              <el-input type="textarea" :rows="4" placeholder="请输入内容" v-model="form.ywDetail.djyy">
+              <el-input
+                type="textarea"
+                :rows="4"
+                placeholder="请输入内容"
+                v-model="form.ywDetail.djyy"
+              >
               </el-input>
             </el-form-item>
           </el-col>
@@ -85,18 +137,35 @@
       </el-form>
       <el-collapse accordion>
         <el-collapse-item title="登记情形设置" name="1">
-          <lb-table :column="djqxCol" border :pagination="false" heightNumSetting :data="form.djqx">
+          <lb-table
+            :column="djqxCol"
+            border
+            :pagination="false"
+            heightNumSetting
+            :data="form.djqx"
+          >
           </lb-table>
         </el-collapse-item>
         <el-collapse-item title="材料信息设置" name="2">
-          <lb-table :column="clxxCol" border heightNumSetting :pagination="false" :data="form.clxx">
+          <lb-table
+            :column="clxxCol"
+            border
+            heightNumSetting
+            :pagination="false"
+            :data="form.clxx"
+          >
           </lb-table>
         </el-collapse-item>
-        <el-collapse-item title="刷选权利设置" name="3" v-if="form.ywDetail.sfsxql == '1'">
+        <el-collapse-item
+          title="刷选权利设置"
+          name="3"
+          v-if="form.ywDetail.sfsxql == '1'"
+        >
           <div class="dyztsd-title">
             <b>请勾选需要查询的权利信息</b>
             <div>
-              <el-button type="text" @click="handleSelectall">选择全部
+              <el-button type="text" @click="handleSelectall"
+                >选择全部
               </el-button>
               <el-button type="text" @click="handleInvert">清除全部</el-button>
             </div>
@@ -116,10 +185,6 @@
               <div class="screen-list-left">
                 {{ item.sxzdmc }} ：
                 <el-checkbox v-model="item.checked">禁止办理</el-checkbox>
-                <!-- <el-radio-group v-model="item.selected">
-                  <el-radio label="1">禁止办理</el-radio>
-                  <el-radio label="0">忽略</el-radio>
-                </el-radio-group> -->
               </div>
             </li>
           </ul>
@@ -155,7 +220,7 @@ export default {
   },
   components: {},
   name: "componentDialog",
-  data () {
+  data() {
     return {
       tn: 0,
       n: 0,
@@ -170,12 +235,12 @@ export default {
   computed: {
     ...mapGetters(["dictData"]),
   },
-  mounted () {
+  mounted() {
     sendThis(this);
   },
   methods: {
     //页面初始化
-    init () {
+    init() {
       this.tn = 0;
       getDjlxInfo(this.sqqlRule.bsmSqyw).then((res) => {
         let { result } = res;
@@ -189,13 +254,13 @@ export default {
       //}
     },
     //tab选项卡事件
-    handleTitleSelct (obj, index) {
+    handleTitleSelct(obj, index) {
       this.n = 0;
       this.tn = index;
       this.getDetail(this.djlxList[index].bsmSqyw);
     },
     //获取业务具体明细内容
-    getDetail (bsmSqyw) {
+    getDetail(bsmSqyw) {
       getSqdjywDetail(bsmSqyw).then((res) => {
         if (res.code === 200) {
           this.form = res.result;
@@ -205,7 +270,7 @@ export default {
       });
     },
     //提交保存数据
-    submit () {
+    submit() {
       let that = this;
       saveSqdjyw(this.form).then((res) => {
         if (res.code == 200) {
@@ -218,25 +283,49 @@ export default {
       });
     },
     //修改父组件传过来的值
-    cancelDialog () {
+    cancelDialog() {
       this.$emit("update:dialogVisible", false);
     },
     // 上移下移
-    moveUpward (index, row, type) {
+    moveUpward(index, row, type) {
       if (type == "clxx") {
-        upward(index, this.form.clxx)
+        upward(index, this.form.clxx);
       } else {
-        upward(index, this.form.djqx)
+        upward(index, this.form.djqx);
       }
-
     },
-    moveDown (index, row, type) {
+    moveDown(index, row, type) {
       if (type == "clxx") {
-        down(index, this.form.clxx)
+        down(index, this.form.clxx);
       } else {
-        down(index, this.form.djqx)
+        down(index, this.form.djqx);
       }
     },
+    addDjqx() {
+      this.form.djqx.push({
+        nodecode: "",
+        nodename: "",
+        enabled: "1",
+        djyy: "",
+        sfqydjyymb: "0",
+      });
+    },
+    removeDjqx(index, row) {
+      this.form.djqx.splice(index, 1);
+    },
+    addClxx() {
+      this.form.clxx.push({
+        isrequired: "1",
+        djqxbm: "",
+        clbm: "",
+        clmc: "",
+        cllx: "",
+        sfggcl: "1",
+      });
+    },
+    removeClxx(index, row) {
+      this.form.clxx.splice(index, 1);
+    },
   },
 };
 </script>

@@ -66,7 +66,7 @@
       <el-row>
         <el-col :span="16">
           <el-form-item label="地址">
-            <el-input v-model="ruleForm.dz"></el-input>
+            <el-input v-model="ruleForm.txdz"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -160,7 +160,7 @@ export default {
         frmc: "",
         gjdq: "",
         szss: "",
-        dz: "",
+        txdz: "",
         yb: "",
         fzjg: "",
         dzyj: "",

@@ -32,6 +32,7 @@ export default {
       key: 0,
       dataIndex: 0,
       dialog: false,
+      isaddupdate:false,
       details: {},
       tableDataList: [],
       InformationTable: [
@@ -147,16 +148,24 @@ export default {
   },
   methods: {
     handleupdateDetail (value) {
+      debugger
+      if(this.isaddupdate){
+        if (!_.isEqual(value, this.tableData)) {
+          this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
+          this.$emit('upDateQlrxxList', this.tableDataList)
+        }
+      }else{
         if (!_.isEqual(value, this.tableData)) {
           this.tableDataList[this.dataIndex] = _.cloneDeep(value);
-        // this.key++
           this.$emit('upDateQlrxxList', this.tableDataList)
         }
+      }
     },
 
     // 新增
     addClick () {
       this.dialog = true
+      this.isaddupdate=true
     },
 
     // 删除
@@ -172,6 +181,7 @@ export default {
       this.dataIndex = index
       this.dialog = true
       this.details = row
+      this.isaddupdate=false
     },
     queryViewClick () {
       this.dialog = true

@@ -100,7 +100,7 @@
         </el-row>
 
         <div class="slxx_title title-block">
-          抵押信息11
+          抵押信息
           <div class="triangle"></div>
         </div>
 

@@ -147,6 +147,8 @@
         </el-row>
         <qlrCommonTable :tableData="ruleForm.qlrList" @upDateQlrxxList="upDateQlrxxList"
           :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" />
+
+          
         <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0">
           <div class="slxx_title title-block">
             义务人信息

@@ -3,7 +3,7 @@
     <div class="from-clues-header">
       <el-tabs v-model="activeName" @tab-click="handleTabClick" v-if="!isJump">
         <el-tab-pane label="自然幢" name="zrz"></el-tab-pane>
-        <el-tab-pane label="户" name="h"></el-tab-pane>
+        <el-tab-pane label="多幢" name="h"></el-tab-pane>
       </el-tabs>
       <el-form :model="queryForm" ref="queryForm" label-width="110px">
         <el-row>

@@ -73,7 +73,7 @@ class data extends filter {
         label: "权利人",
       },
       {
-        prop: "zjh",
+        prop: "qlrzjhm",
         label: "证件号",
       },
       {