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

@@ -78,6 +78,27 @@ export function getNewDate(type = 1) {
   }
 }
 
+// 获取当前时间
+/**
+ * @description: 获取当前时间
+ * @param {*} type
+ * @author: renchao
+ */
+export function getDateToString(date,type) {
+  const now = new Date(date);
+  const year = now.getFullYear();
+  const month = String(now.getMonth() + 1).padStart(2, '0');
+  const day = String(now.getDate()).padStart(2, '0');
+  const hours = String(now.getHours()).padStart(2, '0');
+  const minutes = String(now.getMinutes()).padStart(2, '0');
+  const seconds = String(now.getSeconds()).padStart(2, '0');
+  if (type == 1) {
+    return `${year}年${month}月${day}日`
+  } else {
+    return `${year}年${month}月${day}日 ${hours}时${minutes}分${seconds}秒`
+  }
+}
+
 export function getNewDatesh() {
   const now = new Date();
   const year = now.getFullYear();

@@ -4,132 +4,231 @@
  * @LastEditTime: 2023-07-03 10:44:15
 -->
 <template>
-  <div class="printView" style="width:100%;padding:20px">
-    <h1 style="color: red;
-      text-align: center;
-      font-size: 38px;">{{form.djSqcxDO.ssqy}}不动产登记交易服务中心</h1>
-    <p style="width:100%;border-bottom: 1px solid red;margin-top: 20px;
-      margin-bottom: 10px;"></p>
-    <h2 style="font-size: 36px;
-      text-align: center;">不动产登记信息查询证明</h2>
-    <h5 style=" text-align: center;
-      margin-top: 20px;
-      font-size: 18px;">查询证明编号: {{form.djSqcxDO.cxbh}}</h5>
-    <p v-if="form.cxjgList.length>0" style="text-indent: 2em;
-      margin-top: 15px;
-      line-height: 24px;
-      font-size: 18px;">根据《不动产登记暂行条例》和《不动产登记资料查询暂行办法》
-      有关规定，经线上查询不动产登记信息系统，权利人： {{form.cxjgList[0].qlrmc}}
-      ，证件号：{{form.cxjgList[0].zjhm}}，截止{{newDatez}}
-      ，名下不动产登记信息查询结果如下：</p>
-    <table style=" border-collapse: collapse;
-      width: 100%;
-      margin-top: 20px;margin-left:20px">
+  <div class="printView" style="width: 100%; padding: 20px">
+    <h1 style="color: red; text-align: center; font-size: 38px">
+      {{ form.djSqcxDO.ssqy }}不动产登记交易服务中心
+    </h1>
+    <p
+      style="
+        width: 100%;
+        border-bottom: 1px solid red;
+        margin-top: 20px;
+        margin-bottom: 10px;
+      "
+    ></p>
+    <h2 style="font-size: 36px; text-align: center">不动产登记信息查询证明</h2>
+    <h5 style="text-align: center; margin-top: 20px; font-size: 18px">
+      查询证明编号: {{ form.djSqcxDO.cxbh }}
+    </h5>
+    <p
+      v-if="form.cxjgList.length > 0"
+      style="
+        text-indent: 2em;
+        margin-top: 15px;
+        line-height: 24px;
+        font-size: 18px;
+      "
+    >
+      根据《不动产登记暂行条例》和《不动产登记资料查询暂行办法》
+      有关规定，经线上查询不动产登记信息系统，权利人：
+      {{ form.cxjgList[0].qlrmc }} ，证件号：{{ form.cxjgList[0].zjhm }}，截止{{
+        newDatez
+      }}
+      ，名下不动产登记信息查询结果如下：
+    </p>
+    <table
+      style="
+        border-collapse: collapse;
+        width: 100%;
+        margin-top: 20px;
+        margin-left: 20px;
+      "
+    >
       <thead>
         <tr>
-          <th style="background-color: #f2f2f2;
-      text-align: center;height:36px">不动产权证号</th>
-          <th style="background-color: #f2f2f2;
-      text-align: center;height:36px">权利人</th>
-          <th style="background-color: #f2f2f2;
-      text-align: center;height:36px">证号</th>
-          <th style="background-color: #f2f2f2;
-      text-align: center;height:36px">坐落</th>
-          <th style="background-color: #f2f2f2;
-      text-align: center;height:36px">面积</th>
-          <th style="background-color: #f2f2f2;
-      text-align: center;height:36px">是否抵押</th>
-          <th style="background-color: #f2f2f2;
-      text-align: center;height:36px">是否查封</th>
+          <th
+            style="background-color: #f2f2f2; text-align: center; height: 36px"
+          >
+            不动产权证号
+          </th>
+          <th
+            style="background-color: #f2f2f2; text-align: center; height: 36px"
+          >
+            权利人
+          </th>
+          <th
+            style="background-color: #f2f2f2; text-align: center; height: 36px"
+          >
+            证号
+          </th>
+          <th
+            style="background-color: #f2f2f2; text-align: center; height: 36px"
+          >
+            坐落
+          </th>
+          <th
+            style="background-color: #f2f2f2; text-align: center; height: 36px"
+          >
+            面积
+          </th>
+          <th
+            style="background-color: #f2f2f2; text-align: center; height: 36px"
+          >
+            是否抵押
+          </th>
+          <th
+            style="background-color: #f2f2f2; text-align: center; height: 36px"
+          >
+            是否查封
+          </th>
         </tr>
       </thead>
       <tbody>
-        <tr v-for="(item,index) in form.cxjgList" :key="index">
-          <td style="border: 1px solid #ccc;
-            text-align: center;
-            padding: 8px;
-            text-align: left;">{{ item.bdcqzh }}</td>
-          <td style="border: 1px solid #ccc;
-            text-align: center;
-            padding: 8px;
-            text-align: left;">{{ item.qlrmc }}</td>
-          <td style="border: 1px solid #ccc;
-            text-align: center;
-            padding: 8px;
-            text-align: left;">{{ item.zjhm }}</td>
-          <td style="border: 1px solid #ccc;
-            text-align: center;
-            padding: 8px;
-            text-align: left;">{{ item.zl }}</td>
-          <td style="border: 1px solid #ccc;
-            text-align: center;
-            padding: 8px;
-            text-align: left;">{{ item.fwmj }}</td>
-          <td style="border: 1px solid #ccc;
-            text-align: center;
-            padding: 8px;
-            text-align: left;">{{ item.dyzt=='0'?"否":"是" }}</td>
-          <td style="border: 1px solid #ccc;
-            text-align: center;
-            padding: 8px;
-            text-align: left;">{{ item.cfzt=='0'?"否":"是" }}</td>
+        <tr v-for="(item, index) in form.cxjgList" :key="index">
+          <td
+            style="
+              border: 1px solid #ccc;
+              text-align: center;
+              padding: 8px;
+              text-align: left;
+            "
+          >
+            {{ item.bdcqzh }}
+          </td>
+          <td
+            style="
+              border: 1px solid #ccc;
+              text-align: center;
+              padding: 8px;
+              text-align: left;
+            "
+          >
+            {{ item.qlrmc }}
+          </td>
+          <td
+            style="
+              border: 1px solid #ccc;
+              text-align: center;
+              padding: 8px;
+              text-align: left;
+            "
+          >
+            {{ item.zjhm }}
+          </td>
+          <td
+            style="
+              border: 1px solid #ccc;
+              text-align: center;
+              padding: 8px;
+              text-align: left;
+            "
+          >
+            {{ item.zl }}
+          </td>
+          <td
+            style="
+              border: 1px solid #ccc;
+              text-align: center;
+              padding: 8px;
+              text-align: left;
+            "
+          >
+            {{ item.fwmj }}
+          </td>
+          <td
+            style="
+              border: 1px solid #ccc;
+              text-align: center;
+              padding: 8px;
+              text-align: left;
+            "
+          >
+            {{ item.dyzt == "0" ? "否" : "是" }}
+          </td>
+          <td
+            style="
+              border: 1px solid #ccc;
+              text-align: center;
+              padding: 8px;
+              text-align: left;
+            "
+          >
+            {{ item.cfzt == "0" ? "否" : "是" }}
+          </td>
         </tr>
       </tbody>
     </table>
-    <h6 style="font-size: 28px;
-      margin-top: 20px;
-      font-weight: 100;">特此证明。</h6>
+    <h6 style="font-size: 28px; margin-top: 20px; font-weight: 100">
+      特此证明。
+    </h6>
     <div>
-      <img :src="qrcodeImage" alt="QR Code">
+      <img :src="qrcodeImage" alt="QR Code" />
     </div>
-    <ul style="text-align: right;
-      line-height: 36px;
-      font-size: 18px;">
-      <li style="list-style: none;">{{form.djSqcxDO.ssqy}}不动产登记交易服务中心</li>
-      <li style="list-style: none;">{{newDate}}</li>
+    <ul style="text-align: right; line-height: 36px; font-size: 18px">
+      <li style="list-style: none">
+        {{ form.djSqcxDO.ssqy }}不动产登记交易服务中心
+      </li>
+      <li style="list-style: none">{{ newDate }}</li>
     </ul>
-    <ol style="margin-left: 20px;
-      line-height: 36px;">
+    <ol style="margin-left: 20px; line-height: 36px">
       <p>说明：</p>
-      <li>该查询结果仅显示权利人在当前查询时间点不动产（房产）登记有关情况（“/”表示未查询到不动产登记信息）；</li>
-      <li>该查询结果包含权利人不动产预告登记信息。查询范围为本市中心城区及开发区内的不动产登记信息；</li>
-      <li>本次查询由系统终端自动检索，因数据采集处理误差而造成查询结果于实际登记信息不相符的，以我中心登记簿记载信息为准；</li>
-      <li>查询人应当妥善保管不动产登记查询结果，因操作不当，导致查询结果泄露，有关责任概由查询人承担。</li>
+      <li>
+        该查询结果仅显示权利人在当前查询时间点不动产（房产）登记有关情况（“/”表示未查询到不动产登记信息）；
+      </li>
+      <li>
+        该查询结果包含权利人不动产预告登记信息。查询范围为本市中心城区及开发区内的不动产登记信息；
+      </li>
+      <li>
+        本次查询由系统终端自动检索，因数据采集处理误差而造成查询结果于实际登记信息不相符的，以我中心登记簿记载信息为准；
+      </li>
+      <li>
+        查询人应当妥善保管不动产登记查询结果，因操作不当，导致查询结果泄露，有关责任概由查询人承担。
+      </li>
     </ol>
   </div>
 </template>
 <script>
-  import QRCode from 'qrcode';
-  import { getNewDate } from '@/utils/util'
-  export default {
-    props: {
-      form: {
-        type: Object,
-        default: () => ({})
-      }
+import QRCode from "qrcode";
+import { getDateToString } from "@/utils/util";
+export default {
+  props: {
+    form: {
+      type: Object,
+      default: () => ({}),
     },
-    data () {
-      return {
-        qrcodeImage: '',
-        newDate: getNewDate(),
-        newDatez: getNewDate(2)
-      }
+  },
+  data() {
+    return {
+      qrcodeImage: "",
+      newDate: "",
+      newDatez: "",
+    };
+  },
+  watch: {
+    "form.djSqcxDO.cxbh": {
+      handler: function (val) {
+        if (val) {
+          QRCode.toDataURL(val)
+            .then((url) => {
+              this.qrcodeImage = url;
+            })
+            .catch((error) => {
+              console.error(error);
+            });
+        }
+      },
+      immediate: true,
+      deep: true,
     },
-    watch: {
-      "form.djSqcxDO.cxbh": {
-        handler: function (val) {
-          if (val) {
-            QRCode.toDataURL(val)
-              .then(url => {
-                this.qrcodeImage = url
-              })
-              .catch(error => {
-                console.error(error);
-              })
-          }
-        },
-        immediate: true
-      }
+    form: {
+      handler: function (val) {
+        if (this.form.djSqcxDO.cxsj) {
+          this.newDate = getDateToString(this.form.djSqcxDO.cxsj, 1);
+          this.newDatez = getDateToString(this.form.djSqcxDO.cxsj, 2);
+        }
+      },
+      deep: true
     }
   }
-</script>
\ No newline at end of file
+};
+</script>

@@ -22,17 +22,17 @@ class data extends filter {
           )
         }
       },
-      {
-        label: "查询类型",
-        render: (h, scope) => {
-          switch (scope.row.cxlx) {
-            case '1':
-              return <div>家庭房产</div>
-            case '2':
-              return <div>房屋明细</div>
-          }
-        }
-      },
+      // {
+      //   label: "查询类型",
+      //   render: (h, scope) => {
+      //     switch (scope.row.cxlx) {
+      //       case '1':
+      //         return <div>家庭房产</div>
+      //       case '2':
+      //         return <div>房屋明细</div>
+      //     }
+      //   }
+      // },
       {
         prop: "cxbh",
         label: "查询编号",
@@ -52,6 +52,17 @@ class data extends filter {
       {
         prop: "ycqrgxmc",
         label: "与产权人的关系",
+        
+        render: (h, scope) => {
+          switch (scope.row.ycqrgx) {
+            case '1':
+              return <div>房屋权利人</div>
+            case '2':
+              return <div>产权利害关系人</div>
+            case '3':
+                return <div>委托人</div>             
+          }         
+        }
       },
       {
         prop: "qlrxm",

@@ -37,9 +37,9 @@ class data extends filter {
         render: (h, scope) => {
           switch (scope.row.cxlx) {
             case '1':
-              return <div>家庭房产</div>
+              return <div>家庭房产查询</div>
             case '2':
-              return <div>房屋明细</div>
+              return <div>不动产明细查询</div>
           }
         }
       },

-<!--
- * @Description: 交易合同
- * @Autor: renchao
- * @LastEditTime: 2024-03-21 16:58:45
--->
 <template>
   <div class='jyht'>
     <el-form :model="queryForm">
       <el-row :gutter="10">
-        <el-col :span="6">
-          <el-form-item label="合同号">
-            <el-input v-model="queryForm.htbh"></el-input>
-          </el-form-item>
-        </el-col>
-        <!-- <el-col :span="6">
-          <el-form-item label="证件号码">
+        <el-col :span="8">
+          <el-form-item label="行政区">
             <el-input v-model="queryForm.sfzjhm"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="业务号">
             <el-input v-model="queryForm.ywh"></el-input>
           </el-form-item>
-        </el-col> -->
-        <!-- <el-col :span="6" class="btnColRight">
-          <el-button type="primary" @click="handleSearch">查询</el-button>
-        </el-col> -->
+        </el-col>       
+        <el-col :span="8">
+          <el-form-item label="用户编号">
+            <el-input v-model="queryForm.ywh"></el-input>
+          </el-form-item>
+        </el-col>       
+      </el-row>
+      <el-row :gutter="10">
+        <el-col :span="8">
+          <el-form-item label="房产证编号">
+            <el-input v-model="queryForm.ywh"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <el-form-item label="房屋坐落（地址）">
+            <el-input v-model="queryForm.sfzjhm"></el-input>
+          </el-form-item>
+        </el-col>           
       </el-row>
     </el-form>
-
     <lb-table ref="table" @row-click="handleRowClick" :pagination="false" :key="key"
       :column="tableData.columns"
       :data="tableData.data">
     </lb-table>
     <div class="text-center">
       <el-button @click="$popupCacel">取消</el-button>
-      <!-- <el-button type="primary" @click="handleSubmit" plain>保存</el-button> -->
-      <el-button type="primary" @click="handleSearch">查询</el-button>
+      <el-button type="primary" @click="handleSearch">保存</el-button>
     </div>
   </div>
 </template>

@@ -71,8 +71,7 @@
         </el-row>
         <div class="slxx_title title-block">
           电力过户信息
-
-          <el-button @click="showDialogDlxx">电力过户信息修改</el-button>
+          <el-button type="primary" @click="handleDlxx">电力过户信息修改</el-button>
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">
@@ -172,12 +171,6 @@
         </div>
       </div>
     </el-form>
-    <el-dialog :visible.sync="dialogDlxx" title="电力过户信息修改">
-      <div class="text-center">
-        <el-button @click="$popupCacel">取消</el-button>
-        <el-button type="primary" @click="onSubmit" plain>保存</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 <script>
@@ -195,7 +188,6 @@ export default {
   },
   data() {
     return {
-      dialogDlxx: false,
       loading: false,
       //表单是否可操作
       viewEdit: false,
@@ -220,8 +212,18 @@ export default {
       });
     },
     onSubmit() {},
-    showDialogDlxx() {
-      this.dialogDlxx = true;
+    handleDlxx() {
+      let formData = {
+          bsmSldy: this.propsParam.bsmSldy,
+          qxdm: this.ruleForm.qlxx.qxdm,
+          bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
+        };       
+        if(this.ruleForm.wqht==null){
+          formData.htbh='';
+        }else{
+          formData.htbh=this.ruleForm.wqht.wqhth;  
+        }
+        this.$popupDialog('房产电力过户详情', 'workflow/main/sdqxx/dlxx', formData, '60%', true)
     },
   },
 };

@@ -90,9 +90,9 @@
         </el-row>
         <el-row :gutter="10" v-if="ruleForm.fdcq2">
           <el-col :span="8">
-            <el-form-item label="宗地面积：" prop="zdjbxx.zdmj">
+            <el-form-item label="宗地面积：">
               <div class="flex">
-                <el-input :disabled="!viewEdit" v-model="ruleForm.zdjbxx.zdmj"></el-input>
+                <el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input>
                 <el-select
                   disabled
                   v-model="ruleForm.zdjbxx.mjdw"
@@ -235,7 +235,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="房地产交易价格：" prop="fdcq2.fdcjyjg">
+            <el-form-item label="房产交易价格：" prop="fdcq2.fdcjyjg">
               <div class="flex">
                 <el-input
                   maxlength="11"

@@ -66,7 +66,7 @@
         <div class="slxx_title title-block">
           <el-row>
             <el-col :span="24"> 房屋合同信息
-              &nbsp;&nbsp;<el-button type="primary" @click="handleContract">查询房屋交易合同</el-button> </el-col>
+              &nbsp;&nbsp;<el-button type="primary" v-show="viewEdit" @click="handleContract">查询房屋交易合同</el-button> </el-col>
             <!-- <el-col :span="4" class="btnColRight">
               
             </el-col> -->
@@ -183,7 +183,7 @@
        
         <div class="slxx_title title-block">
           <el-row>
-            <el-col :span="24"> 缴税信息 <el-button type="primary" @click="handleSwwsxx">查询契税完税信息</el-button></el-col>          
+            <el-col :span="24"> 缴税信息 <el-button type="primary" v-show="viewEdit" @click="handleSwwsxx">查询契税完税信息</el-button></el-col>          
           </el-row>
           <div class="triangle"></div>
         </div>