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

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-11 09:51:07
+ * @LastEditTime: 2023-07-12 13:26:37
  */
 import request from "@/utils/request";
 let SERVER = window.config
@@ -71,3 +71,16 @@ export function getLpbTj(zrzbsm) {
     method: "get",
   });
 }
+
+/**
+ * @description:楼盘查询- 根据bsmSlsq查询自然幢标识码
+ * @param {*} data
+ * @author: renchao
+ */
+ export function getZrzbsm(bsm) {
+  return request({
+    url: SERVER.SERVERAPI + "/rest/zhcx/search/getZrzbsmList?bsmSlsq=" + bsm,
+    method: "post",
+    data: bsm,
+  });
+}
\ No newline at end of file

@@ -33,10 +33,7 @@
               <p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p>
               <p v-else >{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
             </div>
-            <i
-              class="el-icon-delete"
-              @click.stop="handleDel(item)"
-            ></i>
+            <i class="el-icon-delete" v-if="delel"></i>
           </el-menu-item>
         </el-menu>
       </div>
@@ -86,6 +83,7 @@ export default {
       activeIndex: "0",
       // 折叠
       isShowdrawer: true,
+      delel: true,
       //批量操作按钮名称
       batchButtonName: "",
       //左侧菜单数据集合
@@ -104,6 +102,7 @@ export default {
     };
   },
   mounted() {
+    this.delel=this.$parent.isEdit
        this.loadBdcdylist();
      this.getleftMenubl();
 

@@ -70,7 +70,7 @@
             }
           },
           {
-            prop: "sqrmc",
+            prop: "ywrmc",
             label: "姓名/名称"
           },
           {
@@ -121,7 +121,7 @@
           this.$nextTick(() => {
             if (val.length == 0 || !val) {
               that.tableDataList = _.cloneDeep([{
-                sqrmc: '',
+                ywrmc: '',
                 dlrzjlx: '',
                 dlrzjh: '',
                 fr: ''

@@ -283,8 +283,8 @@
               v-model="ruleForm.diyaq.zwlxqssj"
               type="date"
             placeholder="选择日期"
-              value-format="yyyy/MM/dd HH:mm:ss"
-              format="yyyy/MM/dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -295,8 +295,8 @@
               v-model="ruleForm.diyaq.zwlxjssj"
               type="date"
              placeholder="选择日期"
-              value-format="yyyy/MM/dd HH:mm:ss"
-              format="yyyy/MM/dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -419,8 +419,8 @@
               v-model="ruleForm.qlxx.zxsj"
               type="date"
               placeholder="选择日期"
-              value-format="yyyy/MM/dd HH:mm:ss"
-              format="yyyy/MM/dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>

@@ -175,7 +175,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="房屋结构：">
+            <el-form-item label="房屋结构：" prop="fdcq2.fwjg"  :rules="rules.fwjgrules">
               <el-select v-model="ruleForm.fdcq2.fwjg">
                 <el-option
                   v-for="item in dictData['A46']"
@@ -407,6 +407,7 @@ export default {
       ruleForm: {},
      //传递参数\
          rules: {
+
           bdcqzhrules:[
             { required: true, message: "不动产权证号：", trigger: "change" },
           ],
@@ -414,6 +415,7 @@ export default {
         djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
         dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
         djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
+        fwjgrules: [{ required: true, message: "房屋结构", trigger: "change" }],
       },
     };
   },

@@ -63,8 +63,8 @@
                       v-model="item.shkssj"
                       type="date"
                      placeholder="选择日期"
-                      value-format="yyyy/MM/dd HH:mm:ss"
-                      format="yyyy/MM/dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd"
                     >
                     </el-date-picker>
                   </el-form-item>

@@ -45,8 +45,8 @@
             type="date"
             :disabled="disabled"
            placeholder="选择日期"
-            value-format="yyyy/MM/dd HH:mm:ss"
-            format="yyyy/MM/dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd"
             @blur="addrow(scope.row)">
           </el-date-picker>
         </template>
@@ -58,8 +58,8 @@
             type="date"
             :disabled="disabled"
              placeholder="选择日期"
-            value-format="yyyy/MM/dd HH:mm:ss"
-            format="yyyy/MM/dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd"
             @blur="addrow(scope.row)">
           </el-date-picker>
         </template>

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-12 14:20:44
+ * @LastEditTime: 2023-07-12 14:23:25
  */
 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
 import { getPrintTemplateByCode } from "@/api/system";
@@ -17,6 +17,7 @@ import {
 } from "@/api/fqsq.js";
 import { mapGetters } from 'vuex'
 import { log } from "bpmn-js-token-simulation";
+import { getZrzbsm } from "@/api/lpb";
 export default {
   data () {
     return {
@@ -139,9 +140,18 @@ export default {
           )
           break;
         case "B8":
+          getZrzbsm(this.bsmSlsq).then((res) => {
+            if (res.code === 200) {
               this.$popupDialog('楼盘表', 'lpb/index', {
-            bsm: ''
+                bsm: res.result[0]
               }, '90%', true)
+            } else {
+              this.$message.error(res.message)
+            }
+          })
+            .catch((err) => {
+              this.$message.error(err)
+            });
           break;
         // 图形定位
         case "B-TXDW":