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

@@ -31,13 +31,13 @@
   </div>
 </template>
 <script>
+  import { getLpb } from "@/api/lpcx.js";
   import chCpn from "./ch.vue";
   import zdyCpn from "./zdys.vue";
   import ljzsCpn from "./ljzs.vue";
-  import { getLpb } from "@/api/lpcx.js";
   import { startBusinessFlow, choiceBdcdy, againAddSldy } from "@/api/workFlow.js";
   import jump from "../../ywbl/ywsq/components/mixin/jump";
-  import store from "@/store/index.js";
+  import store from '@/store/index.js'
   import { ywPopupCacel } from "@/utils/popup.js";
   export default {
     mixins: [jump],
@@ -81,50 +81,68 @@
         type: Object,
         default: () => { }
       },
-      isJump: { type: Boolean, default: false },
-    },
-    data () {
-      return {
-        lpbData: {
-          ljzs: [],
-          cs: [],
-          zdys: [],
+      name: "",
+      components: { chCpn, zdyCpn, ljzsCpn },
+      props: {
+        zrzbsm: {
+          type: String,
+          default: "",
         },
-        //户全选标识 由于依赖注入的绑定并不是可响应的,所以传入可监听的对象以获取其属性的响应
-        selectAllObj: {
-          selectAll: false,
+        lpbParent: {
+          type: String,
+          default: "isLpb",
         },
-        //层户右键菜单显隐
-        lpbChVisible: false,
-        //右键菜单定位位置
-        lpbChLeft: 100,
-        lpbChTop: 100,
-        // 改变户选中状态
-        changeChoosedObj: {
-          bsms: [],
-          color: ''
+        isHb: {
+          type: Boolean,
+          default: true,
         },
-        // 选中户bsm合集
-        bsmList: [],
-        loading: false,
-      };
-    },
-    mounted () {
-      this.scyclx ? this.getLpb(this.zrzbsm, this.scyclx) : this.getLpb(this.zrzbsm);
-      window.lpbContent = this;
-    },
-    methods: {
-      /**
-       * @description: 获取当前楼盘表选中户信息
-       * @param {Array} bsmList
-       * @author: renchao
-       */
-      getBsmList (bsmList, compFlag) {
-        // 根据本次传入的组件标识删除之前对应组件标识存入hbsmList的数据
-        this.bsmList = this.bsmList.filter((i) => i.flag != compFlag)
-        // 合并本次数据
-        this.bsmList = this.bsmList.concat([...new Map(bsmList.map(item => [item.bdcdyh, item])).values()]);
-        // })
+        onlyShow: {
+          type: Boolean,
+          default: true,
+        },
+        showSave: {
+          type: Boolean,
+          default: false,
+        },
+        scyclx: {
+          type: Number,
+          default: 0,
+        },
+        sqywInfo: {
+          type: Object,
+          default: () => { }
+        },
+        isJump: { type: Boolean, default: false },
+      },
+      data () {
+        return {
+          lpbData: {
+            ljzs: [],
+            cs: [],
+            zdys: [],
+          },
+          //户全选标识 由于依赖注入的绑定并不是可响应的,所以传入可监听的对象以获取其属性的响应
+          selectAllObj: {
+            selectAll: false,
+          },
+          //层户右键菜单显隐
+          lpbChVisible: false,
+          //右键菜单定位位置
+          lpbChLeft: 100,
+          lpbChTop: 100,
+          // 改变户选中状态
+          changeChoosedObj: {
+            bsms: [],
+            color: ''
+          },
+          // 选中户bsm合集
+          bsmList: [],
+          loading: false,
+        };
+      },
+      mounted () {
+        this.scyclx ? this.getLpb(this.zrzbsm, this.scyclx) : this.getLpb(this.zrzbsm);
+        window.lpbContent = this;
       },
       /**
        * @description: 保存当前楼盘表
@@ -136,7 +154,6 @@
           return;
         }
         this.loading = true;
-        store.dispatch('user/reMenuRefresh', false)
         againAddSldy({
           bsmSqyw: this.sqywInfo.bsmSqyw,
           bsmSlsq: this.sqywInfo.bsmSlsq,
@@ -150,16 +167,22 @@
               message: '添加成功',
               type: 'success'
             })
-            store.dispatch('user/reMenuRefresh', true)
             if (!this.isJump) {
               this.jump(res.result, this.sqywInfo.djywbm)
+            } else {
+              store.dispatch('user/refreshPage', true);
             }
+            //this.close();
             this.$popupCacel();
           } else {
             if (res.result && res.result.length > 0) {
               this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
             } else {
-              this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } })
+              if (res.result && res.result.length > 0) {
+                this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
+              } else {
+                this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } })
+              }
             }
           }
         }).catch(() => {
@@ -206,24 +229,34 @@
        * @author: renchao
        */
       getLpb (zrzbsm, scyclx, actual) {
-        getLpb(zrzbsm, scyclx).then((res) => {
-          if (res.code == 200) {
-            if (scyclx) {
-              if (res.result.syclx == "1") {
-                res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
-                this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
+        if (!zrzbsm) {
+          this.$message({
+            message: "暂无楼盘表",
+            type: "warning",
+          });
+        } else {
+          getLpb(zrzbsm, scyclx).then((res) => {
+            if (res.code == 200) {
+              if (scyclx) {
+                if (res.result.syclx == "1") {
+                  res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
+                  this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
+                }
+              } else {
+                this.$message({
+                  message: res.message,
+                  type: "warning",
+                });
               }
             } else {
-              res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
-              this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
+              this.$message({
+                message: res.message,
+                type: "warning",
+              });
             }
-          } else {
-            this.$message({
-              message: res.message,
-              type: "warning",
-            });
-          }
-        });
+          });
+        }
+
       },
       //户右键点击事件
       /**

@@ -30,30 +30,30 @@
     <el-row>
       <el-col :span="3">
         <el-form-item label="身份证读卡器">
-          <el-button type="text" icon="el-icon-tickets" @click="readClick">读取</el-button>
+          <el-button type="text" icon="el-icon-tickets" :disabled="show" @click="readClick">读取</el-button>
         </el-form-item>
       </el-col>
       <el-col :span="5">
         <el-form-item label="领证人" prop="lzrxm" label-width="70px">
-          <el-input v-model="ruleForm.lzrxm"></el-input>
+          <el-input :disabled="show" v-model="ruleForm.lzrxm"></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="5">
         <el-form-item label="证件类型" prop="lzrzjlb" label-width="80px">
-          <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
-            <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
+          <el-select :disabled="show" v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
+            <el-option  v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
             </el-option>
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="5">
         <el-form-item label="证件号" prop="lzrzjh" label-width="70px">
-          <el-input v-model="ruleForm.lzrzjh"></el-input>
+          <el-input :disabled="show" v-model="ruleForm.lzrzjh"></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="5">
         <el-form-item label="领证人电话" prop="lzrdh">
-          <el-input v-model="ruleForm.lzrdh"></el-input>
+          <el-input :disabled="show" v-model="ruleForm.lzrdh"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
@@ -133,7 +133,8 @@
           total: 0,
           columns: datas.columns().lzgrid,
           data: []
-        }
+        },
+        show:true
       }
     },
     mounted () {
@@ -202,6 +203,7 @@
         getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => {
           if (res.code === 200) {
             this.tableData.data = res.result.list;
+            this.show=!res.result.list.length>0;
             this.$nextTick(() => {
               this.tableData.data.forEach(item => {
                 that.$refs.table.toggleRowSelection(item)

@@ -380,9 +380,9 @@
           </el-col>
         </el-row>
         <qlrCommonTable
+        :tableData="ruleForm.qlrList"
           @upDateQlrxxList="upDateQlrxxList"
-          :disabled="!viewEdit"
-          :tableData="ruleForm.qlrList"
+          :disabled="viewEdit"
           :gyfs="ruleForm.sldy.gyfs" />
         <div class="slxx_title title-block">
           登记原因

@@ -98,6 +98,7 @@
   import table from "@/utils/mixin/table";
   import { datas, sendThis } from "./djbcxdata";
   import { getDjbBysearch } from "@/api/search.js";
+    import { getZrzListByBsmSlsq } from "@/api/workflow/zjgcdyFlow.js";
 
   export default {
     name: "djbcx",
@@ -137,7 +138,8 @@
         },
         qllxs: [],
         isDialog: false,
-        djbxxData: {}
+        djbxxData: {},
+        zrzbsm:""
       }
     },
     computed: {
@@ -188,6 +190,11 @@
        * @author: renchao
        */
       handleLpbClick (item) {
+     let params = {zdbsm:item.bsmZd};
+ getZrzListByBsmSlsq(params).then((res) => {
+        if (res.code === 200) {
+        }
+      });
         console.log("zrzbsm",item,item.zrzbsm);
          this.$popupDialog('楼盘表', 'lpb/index', {
               bsm: item.zrzbsm,