Merge branch 'dev'

@@ -4,6 +4,7 @@
  * @LastEditTime: 2023-09-25 10:56:39
  * @LastEditTime: 2023-09-25 10:56:39
  */
  */
 import store from '@/store'
 import store from '@/store'
+import { log } from 'bpmn-js-token-simulation'
 // table 内部过滤器 由于过滤器只能在模板中使用 所以 就有了 jsx内部方法过滤器
 // table 内部过滤器 由于过滤器只能在模板中使用 所以 就有了 jsx内部方法过滤器
 export default class filter {
 export default class filter {
   /**
   /**
@@ -153,17 +154,37 @@ export default class filter {
       ygmmzt: "已预告买卖",
       ygmmzt: "已预告买卖",
       ygdyzt: "已预告抵押",
       ygdyzt: "已预告抵押",
       dyzt: "已抵押",
       dyzt: "已抵押",
-      sfbl: "正在补录"
+      sfbl: "正在补录",
+      qqzt:"已确权"
     };
     };
 
 
     for (let key in row) {
     for (let key in row) {
       if (row[key] === 1 && strategies[key]) {
       if (row[key] === 1 && strategies[key]) {
         keys++;
         keys++;
         if (keys == 1) {
         if (keys == 1) {
-          text += strategies[key];
+          if(text){
+            text += ',' +strategies[key];
+          }else{
+            text += strategies[key];
+          }
+
         } else {
         } else {
           text += ',' + strategies[key];
           text += ',' + strategies[key];
         }
         }
+      }else if(row[key] ==2 && key=="qqzt"){
+        if(text){
+          text += ','+"已灭失";
+        }else{
+          text += "已灭失";
+        }
+
+      }else if(row[key] ==0 && key=="qqzt"){
+        if(text){
+          text += ','+"未确权";
+        }else{
+          text += "未确权";
+        }
+
       }
       }
     }
     }
 
 

@@ -237,7 +237,7 @@
 
 
             td:first-child {
             td:first-child {
                 flex: inherit !important;
                 flex: inherit !important;
-                // min-width: 180px !important;
+                width:180px !important;
             }
             }
 
 
             >tr:nth-child(odd) td {
             >tr:nth-child(odd) td {
@@ -266,4 +266,4 @@
             margin-left: 2px;
             margin-left: 2px;
         }
         }
     }
     }
-}
\ No newline at end of file
+}

@@ -67,7 +67,7 @@
               正在注销
               正在注销
             </div>
             </div>
 
 
-            <p v-if="!['djyy', 'fj'].includes(item.prop)">
+            <p v-if="!['djyy', 'fj','zl'].includes(item.prop)">
               <span v-if="item.prop == 'qszt'">
               <span v-if="item.prop == 'qszt'">
                 {{ getQsztName(row[item.prop]) }}
                 {{ getQsztName(row[item.prop]) }}
               </span>
               </span>

@@ -236,7 +236,7 @@
 
 
             td:first-child {
             td:first-child {
                 flex: inherit !important;
                 flex: inherit !important;
-                // min-width: 180px !important;
+                width: 180px !important;
             }
             }
 
 
             >tr:nth-child(odd) td {
             >tr:nth-child(odd) td {
@@ -265,4 +265,4 @@
             margin-left: 2px;
             margin-left: 2px;
         }
         }
     }
     }
-}
\ No newline at end of file
+}

@@ -33,7 +33,7 @@
       </tr>
       </tr>
       <tr>
       <tr>
         <td>等级</td>
         <td>等级</td>
-        <td>{{ zdjbxx.djmc }}</td>
+        <td>{{ zdjbxx.dj|dictionary("A50") }}</td>
         <td>价格</td>
         <td>价格</td>
         <td>{{ zdjbxx.jg }}</td>
         <td>{{ zdjbxx.jg }}</td>
       </tr>
       </tr>

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-12-19 09:40:39
+ * @LastEditTime: 2024-03-05 16:03:50
 -->
 -->
 <template>
 <template>
   <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
   <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
@@ -169,11 +169,11 @@
         that.loadStatus = '1';
         that.loadStatus = '1';
         let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
         let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
         if (['zsdy', 'zmdy', 'zsdy1'].includes(that.ruleForm.tmpno)) {
         if (['zsdy', 'zmdy', 'zsdy1'].includes(that.ruleForm.tmpno)) {
-          // LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "B4 (JIS) 旋转"); // 设置纸张大小为 B4
-          LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
+          LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4 (JIS) 旋转"); // 设置纸张大小为 B4
         } else {
         } else {
           LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 A4
           LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 A4
         }
         }
+        LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
         LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板
         LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板
         //窗口关闭后，回调函数中保存的设计代码
         //窗口关闭后，回调函数中保存的设计代码
         if (LODOP.CVERSION)
         if (LODOP.CVERSION)

@@ -6,17 +6,39 @@
 <template>
 <template>
   <div>
   <div>
     <div>
     <div>
-      <el-form-item label="共有方式：">
-        <el-radio-group :disabled="!viewEdit" v-model="ruleForm.sldy.gyfs">
-          <el-radio label="0">单独所有</el-radio>
-          <el-radio label="1">共同共有</el-radio>
-          <el-radio label="2">按份所有</el-radio>
-          <el-radio label="3">其它共有</el-radio>
-        </el-radio-group>
-      </el-form-item>
+      <div>
+        <el-form-item label="共有方式：">
+          <el-radio-group :disabled="!disabled" v-model="sldyData.gyfs" change="gyfsChange">
+            <el-radio label="0">单独所有</el-radio>
+            <el-radio label="1">共同共有</el-radio>
+            <el-radio label="2">按份所有</el-radio>
+            <el-radio label="3">其它共有</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </div>
+      <div v-show="sldyData.gyfs != '0'">
+        <el-form-item label="是否分别持证：">
+          <el-radio-group v-model="sldyData.sqfbcz" :disabled="!disabled">
+            <el-radio :label="1">是</el-radio>
+            <el-radio :label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="持证人：" v-show="sldyData.sqfbcz == '0'">
+          <el-select v-model="czr" placeholder="持证人" :disabled="!disabled">
+            <el-option
+              v-for="(item, index) in tableDataList"
+              :key="index"
+              :label="item.sqrmc"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </div>
     </div>
     </div>
     <lb-table
     <lb-table
-      :column="column"      :pagination="false"
+      :column="column"
+      :pagination="false"
       :key="key"
       :key="key"
       :heightNumSetting="true"
       :heightNumSetting="true"
       :minHeight="0"
       :minHeight="0"
@@ -24,7 +46,7 @@
       :data="tableDataList"
       :data="tableDataList"
     >
     >
     </lb-table>
     </lb-table>
-    <addQlr
+    <addSqr
       v-model="dialog"
       v-model="dialog"
       :details="details"
       :details="details"
       :showButton="disabled"
       :showButton="disabled"
@@ -35,24 +57,24 @@
 <script>
 <script>
 import { mapGetters } from "vuex";
 import { mapGetters } from "vuex";
 import { getIdCardInfo } from "@/utils/operation.js";
 import { getIdCardInfo } from "@/utils/operation.js";
-import addQlr from "./addSqr.vue";
+import addSqr from "./addSqr.vue";
 export default {
 export default {
-  components: {
-    addQlr,
-  },
+  components: { addSqr },
   computed: {
   computed: {
     ...mapGetters(["dictData"]),
     ...mapGetters(["dictData"]),
   },
   },
   props: {
   props: {
-    tableData: {
+    qlrData: {
       type: Array,
       type: Array,
       default: function () {
       default: function () {
         return [];
         return [];
       },
       },
     },
     },
-    gyfs: {
-      type: String,
-      default: "1",
+    sldyData: {
+      type: Object,
+      default: function () {
+        return {};
+      },
     },
     },
     disabled: {
     disabled: {
       type: Boolean,
       type: Boolean,
@@ -105,24 +127,6 @@ export default {
           },
           },
         },
         },
         {
         {
-          label: "身份证读卡器",
-          align: "center",
-          render: (h, scope) => {
-            return (
-              <el-button
-                type="text"
-                icon="el-icon-tickets"
-                disabled={!this.disabled}
-                onClick={() => {
-                  this.readClick(scope.row);
-                }}
-              >
-                读取
-              </el-button>
-            );
-          },
-        },
-        {
           prop: "sqrmc",
           prop: "sqrmc",
           label: "姓名/名称",
           label: "姓名/名称",
         },
         },
@@ -181,10 +185,11 @@ export default {
         },
         },
       ],
       ],
       column: [],
       column: [],
+      czr: "",
     };
     };
   },
   },
   watch: {
   watch: {
-    tableData: {
+    qlrData: {
       handler: function (val, oldVal) {
       handler: function (val, oldVal) {
         let that = this;
         let that = this;
         this.$nextTick(() => {
         this.$nextTick(() => {
@@ -198,12 +203,24 @@ export default {
       immediate: true,
       immediate: true,
       deep: true,
       deep: true,
     },
     },
-    gyfs: {
+    //监听共有方式
+    "sldyData.gyfs": {
       handler(newVal, oldValue) {
       handler(newVal, oldValue) {
         let dataList = _.cloneDeep(this.InformationTable);
         let dataList = _.cloneDeep(this.InformationTable);
-        if (newVal == 0) {
+        if (newVal == "0") {
+          if (this.tableDataList.length > 1) {
+            this.$message({
+              showClose: true,
+              message: "单独所有，只能添加一条权利人记录",
+              type: "error",
+            });
+            sldyData.gyfs = oldValue;
+
+            return false;
+          }
+          this.ruleForm.qlrList[0].sfczr = "1";
           this.column = _.cloneDeep(dataList);
           this.column = _.cloneDeep(dataList);
-          this.tableDataList = _.cloneDeep(this.tableData);
+          this.tableDataList = _.cloneDeep(this.qlrData);
           this.key++;
           this.key++;
         } else if (newVal == "1" || newVal == "3") {
         } else if (newVal == "1" || newVal == "3") {
           this.column = dataList;
           this.column = dataList;
@@ -217,6 +234,39 @@ export default {
       },
       },
       immediate: true,
       immediate: true,
     },
     },
+    //监听申请分别持证
+    "sldyData.sqfbcz": {
+      handler(newVal, oldValue) {
+        if (newVal == 0) {
+          let that = this;
+          if (sldyData.gyfs != "0") {
+            this.tableDataList.forEach((item) => {
+              if (item.bsmSqr == that.czr) {
+                item.sfczr = "1";
+              } else {
+                item.sfczr = "0";
+              }
+            });
+          }
+        } else {
+          this.tableDataList.forEach((item, index) => {
+            item.sfczr = "1";
+          });
+          this.czr = "";
+        }
+      },
+      immediate: true,
+    },
+  },
+  mounted() {
+    let that = this;
+    if (this.sldyData.gyfs != "0" && this.sldyData.sqfbcz == 0) {
+      this.qlrData.forEach((item) => {
+        if (item.sfczr == "1") {
+          that.czr = item.bsmSqr;
+        }
+      });
+    }
   },
   },
   methods: {
   methods: {
     /**
     /**
@@ -227,25 +277,6 @@ export default {
     handleupdateDetail(value) {
     handleupdateDetail(value) {
       let that = this;
       let that = this;
       let arr = this.tableData.map((item) => item.zjh);
       let arr = this.tableData.map((item) => item.zjh);
-      // if (this.isaddupdate) {
-      //   if (!arr.includes(value.zjh)) {
-      //     this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
-      //     this.$emit('upDateQlrxxList', this.tableDataList)
-      //   } else {
-      //     setTimeout(() => {
-      //       that.$message.error('证件号不能重复')
-      //     }, 1500)
-      //   }
-      // } else {
-      //   if (!arr.includes(value.zjh) || this.tableData[this.dataIndex].zjh == value.zjh) {
-      //     this.tableDataList[this.dataIndex] = _.cloneDeep(value);
-      //     this.$emit('upDateQlrxxList', this.tableDataList)
-      //   } else {
-      //     setTimeout(() => {
-      //       that.$message.error('证件号不能重复')
-      //     }, 1500)
-      //   }
-      // }
 
 
       if (this.isaddupdate) {
       if (this.isaddupdate) {
         if (!_.isEqual(value, this.tableData)) {
         if (!_.isEqual(value, this.tableData)) {

@@ -235,10 +235,10 @@
           if (res.code === 200) {
           if (res.code === 200) {
             let { total, records } = res.result;
             let { total, records } = res.result;
             records.forEach((item) => {
             records.forEach((item) => {
-              item.qlrmc = item.qlrmc.join(",");
-              item.ywh = item.ywh.join(",");
-              item.zl = item.zl.join(",");
-              item.outstepdate = item.outstepdate[0];
+              // item.qlrmc = item.qlrmc.join(",");
+              // item.ywh = item.ywh.join(",");
+              // item.zl = item.zl.join(",");
+              // item.outstepdate = item.outstepdate[0];
             });
             });
             this.tableData.total = total ? total : 0;
             this.tableData.total = total ? total : 0;
             this.tableData.data = records ? records : [];
             this.tableData.data = records ? records : [];
@@ -270,9 +270,10 @@
           );
           );
           window.open(href, `djbworkFrameview${item.bsmSlsq}`);
           window.open(href, `djbworkFrameview${item.bsmSlsq}`);
         } else {
         } else {
+          let bestepid=item.bestepid==null?"":item.bestepid;
           const { href } = this.$router.resolve(
           const { href } = this.$router.resolve(
             "/workFrameView?bsmSlsq=" + item.bsmSlsq +
             "/workFrameView?bsmSlsq=" + item.bsmSlsq +
-            "&bestepid=" + item.bestepid
+            "&bestepid=" + bestepid
           );
           );
           window.open(href, `workFrameView${item.bsmSlsq}`)
           window.open(href, `workFrameView${item.bsmSlsq}`)
         }
         }

@@ -42,14 +42,11 @@ class data extends filter {
           if (scope.row.yygqzt == '1') {
           if (scope.row.yygqzt == '1') {
             return <div class='suspend'>异议挂起</div>
             return <div class='suspend'>异议挂起</div>
           }
           }
-          switch (scope.row.lczt) {
-            case '1':
-              return <div class='allow'>进行中</div>
-            case '2':
-              return <div class='prohibit'>已结束</div>
-            case '3':
-              return <span>进行中</span>
-          }
+          if (scope.row.jssj == null) {
+            return <div class='allow'>进行中</div>
+          }else{
+            return <div class='prohibit'>已结束</div>
+          }          
         }
         }
       },
       },
       {
       {
@@ -70,6 +67,11 @@ class data extends filter {
         width: '200'
         width: '200'
       },
       },
       {
       {
+        prop: "bdcdyh",
+        label: "不动产单元号",
+        minWidth: '150',
+      },
+      {
         label: "权利人",
         label: "权利人",
         width: '120',
         width: '120',
         render: (h, scope) => {
         render: (h, scope) => {

@@ -207,6 +207,7 @@
       queryClick () {
       queryClick () {
         this.$startLoading();
         this.$startLoading();
         this.queryForm.sqywbm = this.sqywInfo.djywbm;
         this.queryForm.sqywbm = this.sqywInfo.djywbm;
+        this.queryForm.bhqkbsm = ""
         selectJsydQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => {
         selectJsydQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => {
           this.$endLoading();
           this.$endLoading();
           if (res.code === 200) {
           if (res.code === 200) {

@@ -188,15 +188,13 @@
        * @author: renchao
        * @author: renchao
        */
        */
       handleLpbClick (item) {
       handleLpbClick (item) {
-        this.$popup('楼盘表', 'lpb/index', {
-          width: '85%',
-          formData: {
-            bsm: item.zrzbsm,
+        console.log("zrzbsm",item,item.zrzbsm);
+         this.$popupDialog('楼盘表', 'lpb/index', {
+              bsm: item.zrzbsm,
             zrzbsm: item.zrzbsm,
             zrzbsm: item.zrzbsm,
             zdbsm: item.zrzbsm,
             zdbsm: item.zrzbsm,
             onlyShow: true
             onlyShow: true
-          }
-        })
+        }, '90%', true)
       }
       }
     }
     }
   }
   }