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

@@ -64,14 +64,15 @@
 
     // 有子级
     .el-submenu__title {
-      margin-left: 13px;
-      padding-left: 10px !important;
+      // margin-left: 13px;
+      // padding-left: 10px !important;
       color: $menuText;
       background-color: transparent !important;
+      border-bottom: 1px solid $sliderBorderColor;
 
       &:hover {
         color: $subMenuActiveText !important;
-        background-color: $subMenuHover !important;
+        background-color: $menuHover !important;
 
         .svg-icon,
         i,
@@ -84,10 +85,11 @@
     // 没有子级
     .submenu-title-noDropdown {
       color: $menuText;
-      border-radius: 6px;
-      padding-left: 10px !important;
+      border-bottom: 1px solid $sliderBorderColor;
 
-      &:hover {
+      // border-radius: 6px;
+      // padding-left: 10px !important;
+      b &:hover {
         color: $menuActiveText !important;
         background-color: $subMenuHover !important;
 
@@ -119,8 +121,8 @@
     .el-submenu__title {
       font-weight: 600;
       font-size: $sideBarFontSize;
-      margin: 0 10px;
-      border-radius: 6px;
+      // margin: 0 10px;
+      // border-radius: 6px;
 
       >i {
         color: $subMenuActiveText !important;
@@ -151,22 +153,30 @@
 
     & .nest-menu .el-submenu>.el-submenu__title,
     & .el-submenu .el-menu-item {
+
+
       &.is-active {
         background-color: $subMenuHover !important;
         color: $menuActiveText !important;
+        border-bottom: 1px solid $sliderBorderColor;
       }
 
       &:hover {
         background-color: $subMenuHover !important;
         color: $menuActiveText !important;
+        border-bottom: 1px solid $sliderBorderColor;
       }
 
       min-width: 130px !important;
       background-color: transparent !important;
       font-weight: 600;
       font-size: $sideBarFontSize;
-      margin: 0 10px;
-      border-radius: 6px;
+
+      // margin: 0 10px;
+      // border-radius: 6px;
+      span {
+        margin-left: 10px;
+      }
     }
   }
 
@@ -279,9 +289,9 @@
 
   .nest-menu .el-submenu>.el-submenu__title,
   .el-menu-item {
-    width: calc(100% - 12px);
-    border-top-right-radius: 8px;
-    border-bottom-right-radius: 8px;
+    // width: calc(100% - 12px);
+    // border-top-right-radius: 8px;
+    // border-bottom-right-radius: 8px;
     font-weight: 600 !important;
     font-size: 15px !important;
     background-color: $menuHover !important;

@@ -17,7 +17,7 @@ $menuActiveText:#ffffff;
 $subMenuActiveText:#ffffff;
 
 $menuBg:#202B3D;
-$menuHover:#0794FF;
+$menuHover:#226ca5;
 
 $subMenuBg:#202B3D;
 $subMenuHover:#0794FF;
@@ -27,6 +27,8 @@ $sideBarFontSize:15px;
 
 // border颜色
 $borderColor: #EBEEF5;
+$sliderBorderColor: #606266;
+
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

@@ -21,14 +21,12 @@
             </el-col>
           </el-row>
         </el-form>
-        <!-- <personInfoTable @getInfoList="handleGetSqList" :dataList="form.sqrList" /> -->
-        <lb-table border :column="sqrColumns" key="sqr1" :data="form.sqrList" :maxHeight="200" heightNumSetting
+        <lb-table :column="sqrColumns" key="sqr1" :data="form.sqrList" :maxHeight="200" heightNumSetting
           :pagination="false">
         </lb-table>
 
         <b class="title">权利人</b>
-        <!-- <personInfoTable @getInfoList="handleGetQlList" :dataList="form.qlrList" :isGanged="isGanged" /> -->
-        <lb-table border :column="qlrColumns" key="ql2r" :data="form.qlrList" :maxHeight="200" heightNumSetting
+        <lb-table :column="qlrColumns" key="ql2r" :data="form.qlrList" :maxHeight="200" heightNumSetting
           :pagination="false">
         </lb-table>
         <div v-show="isSearch">
@@ -41,10 +39,10 @@
       <el-divider></el-divider>
       <div class="submit-button" style="padding-bottom:50px">
         <el-button @click="resetClick">重置</el-button>
-        <el-button type="primary" v-show="isSearch==false" @click="queryChick">查询</el-button>
-        <el-button type="primary" v-show="isSearch&&form.dyjlList.length > 0">房产结果打印（{{form.dyjlList.length}}）
+        <el-button type="primary" v-show="isSearch == false" @click="queryChick">查询</el-button>
+        <el-button type="primary" v-show="isSearch && form.dyjlList.length > 0">房产结果打印（{{ form.dyjlList.length }}）
         </el-button>
-        <el-button type="primary" v-show="isSearch&&form.dyjlList.length == 0">无房证明打印（{{form.dyjlList.length}}）
+        <el-button type="primary" v-show="isSearch && form.dyjlList.length == 0">无房证明打印（{{ form.dyjlList.length }}）
         </el-button>
         <el-button @click="closeDialog">关闭</el-button>
       </div>
@@ -68,10 +66,10 @@ export default {
     value: { type: Boolean, default: false },
     bsmSqcx: { type: String, default: "" },
   },
-  mounted() {
+  mounted () {
     sendThis(this);
   },
-  data() {
+  data () {
     return {
       myValue: this.value,
       //是否查询
@@ -99,7 +97,7 @@ export default {
     };
   },
   watch: {
-    value(val) {
+    value (val) {
       this.myValue = val;
       if (val) {
         //this.$alert(this.bsmSqcx);
@@ -109,9 +107,9 @@ export default {
         } else {
           this.loadData();
         }
-      } 
+      }
     },
-    "form.djSqcxDO.ycyrgx"(val) {
+    "form.djSqcxDO.ycyrgx" (val) {
       if (val == "1") {
         this.form.qlrList = this.form.sqrList;
       } else {
@@ -119,15 +117,17 @@ export default {
         this.add("qlr");
       }
     },
-    "form.sqrList"(val) {
-      //this.$alert(val);
-    },
+    "form.sqrList" (val) {
+      if (this.form.djSqcxDO.ycyrgx == '1') {
+        this.form.qlrList = this.form.sqrList
+      }
+    }
   },
   methods: {
-    closeDialog() {
+    closeDialog () {
       this.$emit("input", false);
     },
-    loadData() {
+    loadData () {
       this.$startLoading();
       getJtfcInfo({ sqcxBsm: sqcxBsm }).then((res) => {
         this.$endLoading();
@@ -137,7 +137,7 @@ export default {
         }
       });
     },
-    queryChick() {
+    queryChick () {
       this.$startLoading();
       addJtfcCxjgXx(this.form).then((res) => {
         this.$endLoading();
@@ -148,30 +148,30 @@ export default {
         }
       });
     },
-    resetClick() {
+    resetClick () {
       this.form.djSqcxDO = { ycyrgx: "1", cxyt: "" };
       this.form.sqrList = _.cloneDeep([this.newData]);
-      this.form.qlrList =_.cloneDeep([this.newData]);
+      this.form.qlrList = _.cloneDeep([this.newData]);
       this.form.cxjgList = [];
       this.form.dyjlList = [];
       this.isSearch = false;
     },
-    handleRead(scope) {},
-    add(type) {
+    handleRead (scope) { },
+    add (type) {
       if (type == "sqr") {
-        this.form.sqrList.push(this.newData);
+        this.form.sqrList.push(_.cloneDeep(this.newData));
       } else {
-        this.form.qlrList.push(this.newData);
+        this.form.qlrList.push(_.cloneDeep(this.newData));
       }
     },
-    remove(index, row, type) {
+    remove (index, row, type) {
       if (type == "sqr") {
         this.form.sqrList.splice(index, 1);
       } else {
         this.form.qlrList.splice(index, 1);
       }
     },
-    teltest(row) {
+    teltest (row) {
       const reg = /^1([38]\d|5[0-35-9]|7[3678])\d{8}$/;
       if (row.lxdh == "" || row.lxdh.length <= 10 || !reg.test(row.lxdh)) {
         row.inputErr = true;

@@ -8,7 +8,7 @@ class data extends filter {
   constructor() {
     super()
   }
-  columns() {
+  columns () {
     return [
       {
         prop: 'qszt',
@@ -74,7 +74,7 @@ class data extends filter {
       }
     ]
   }
-  sqrCol() {
+  sqrCol () {
     return [
       {
         width: "60",
@@ -94,7 +94,7 @@ class data extends filter {
             <i
               class="el-icon-minus pointer"
               onClick={() => {
-                vm.remove(scope.$index, scope.row,"sqr");
+                vm.remove(scope.$index, scope.row, "sqr");
               }}
             ></i>
           );
@@ -142,6 +142,7 @@ class data extends filter {
           return (
             <el-select
               class="width100"
+              clearable
               value={scope.row[scope.column.property]}
               onChange={(val) => {
                 scope.row[scope.column.property] = val;
@@ -211,7 +212,7 @@ class data extends filter {
       },
     ]
   }
-  qlrCol() {
+  qlrCol () {
     return [
       {
         width: "60",
@@ -231,7 +232,7 @@ class data extends filter {
             <i
               class="el-icon-minus pointer"
               onClick={() => {
-                vm.remove(scope.$index, scope.row,"qlr");
+                vm.remove(scope.$index, scope.row, "qlr");
               }}
             ></i>
           );

@@ -3,8 +3,7 @@
   作者：calliope
 -->
 <template>
-  <lb-table border :column="tableData.columns" :data="tableData.data" :maxHeight="200" heightNumSetting
-    :pagination="false">
+  <lb-table :column="tableData.columns" :data="tableData.data" :maxHeight="200" heightNumSetting :pagination="false">
   </lb-table>
 </template>
 <script>
@@ -13,7 +12,7 @@ export default {
   props: {
     dataList: { type: Array, default: () => [{}] },
   },
-  created() {
+  created () {
     if (this.dataList.length == 0) {
       this.add();
     }
@@ -21,7 +20,7 @@ export default {
   computed: {
     ...mapGetters(["dictData"]),
   },
-  data() {
+  data () {
     return {
       tableData: {
         columns: [
@@ -184,7 +183,7 @@ export default {
     // },
   },
   methods: {
-    add() {
+    add () {
       this.tableData.data.push({
         sqrxm: "",
         sqrzjlxbm: "",
@@ -193,10 +192,10 @@ export default {
         inputErr: false,
       });
     },
-    remove(index, row) {
+    remove (index, row) {
       this.tableData.data.splice(index, 1);
     },
-    teltest(row) {
+    teltest (row) {
       const reg = /^1([38]\d|5[0-35-9]|7[3678])\d{8}$/;
       if (row.lxdh == "" || row.lxdh.length <= 10 || !reg.test(row.lxdh)) {
         row.inputErr = true;

@@ -86,7 +86,7 @@ export default {
           label: "联系电话"
         },
         {
-          label: '修改',
+          label: '操作',
           render: (h, scope) => {
             return (
               <div>
@@ -98,6 +98,7 @@ export default {
                       icon="el-icon-edit-outline"
                       type="text"
                       onClick={() => { this.editClick(scope.$index, scope.row) }}>编辑</el-button>
+                      
                 }
               </div>
             )
@@ -131,7 +132,9 @@ export default {
       handler (newVal, oldValue) {
         let dataList = _.cloneDeep(this.InformationTable)
         if (newVal == 0) {
-          this.column = _.cloneDeep(dataList).slice(1, dataList.length)
+          // this.column = _.cloneDeep(dataList).slice(1, dataList.length)
+          this.column = _.cloneDeep(dataList)
+
         } else if ((newVal == '1' || newVal == '3')) {
           this.column = dataList
         } else {
@@ -148,7 +151,6 @@ export default {
   },
   methods: {
     handleupdateDetail (value) {
-      debugger
       if(this.isaddupdate){
         if (!_.isEqual(value, this.tableData)) {
           this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
@@ -170,7 +172,14 @@ export default {
 
     // 删除
     deleClick (index, row) {
-      this.tableData.splice(index, 1)
+      this.$confirm('确定要删除吗, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.tableData.splice(index, 1)
+      }).catch(() => {
+      });
     },
 
     // 身份证读取

@@ -171,7 +171,7 @@
         <qlrCommonTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
           :gyfs="ruleForm.qlxx.gyfs" />
 
-        <div v-if="ruleForm.ywrList.length > 0">
+        <div v-if="ruleForm.ywrList">
           <div class="slxx_title title-block">
             义务人信息
             <div class="triangle"></div>

@@ -338,4 +338,4 @@ export default {
 /deep/.el-form-item__label {
   padding-bottom: 0px;
 }
-</style>
\ No newline at end of file
+</style>

@@ -225,6 +225,16 @@ export default {
       this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val))
     },
     onSubmit () {
+      if(this.ruleForm.slywxx.gyfs=="0"){
+        if(this.ruleForm.qlrList.length>1){
+          this.$message({
+            showClose: true,
+            message: "共有方式：单独所有，权利人只能是一个人",
+            type: "error",
+          });
+          return false;
+        }        
+      }
       saveData(this.ruleForm).then((res) => {
         if (res.code === 200) {
           this.$message({