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

tianhaohao@pashanhoo.com
Showing 5 changed files with 82 additions and 26 deletions
src/api/bdcqz.js
src/api/clxx.js
src/views/components/imagePreview.vue
src/views/workflow/components/dialog/zslq.vue
src/views/ywbl/slsqxx/fdcq1/slxx.vue
--- a/src/api/bdcqz.js
View file @f920770
+++ b/src/api/bdcqz.js
View file @f920770
 /*
 * @Description: 不动产权证
 * @Autor: renchao
- * @LastEditTime: 2023-09-05 13:24:14
+ * @LastEditTime: 2023-09-13 16:06:55
 */
 import request from '@/utils/request';
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
@@ -146,3 +146,17 @@ export function getBdcqzDetail (bsmBdcqz) {
        }
    })
 }
+/**
+ * @description: 根据bsmBdcqz获取权利人信息
+ * @param {*} bsmBdcqz
+ * @author: renchao
+ */
+export function getBdcqzQlr (bsmBdcqz) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/bdcqz/getBdcqzQlr',
+        method: 'get',
+        params: {
+            bsmBdcqz: bsmBdcqz
+        }
+    })
+}
--- a/src/api/clxx.js
View file @f920770
+++ b/src/api/clxx.js
View file @f920770
 /*
 * @Description: 材料信息
 * @Autor: renchao
- * @LastEditTime: 2023-09-13 11:09:48
+ * @LastEditTime: 2023-09-13 15:39:37
 */
 import request from '@/utils/request'
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
@@ -115,6 +115,22 @@ export function deleteClmx (bsmClmx) {
 }
 /**
+ * @description: 材料移动
+ * @param {*} data
+ * @author: renchao
+ */
+export function move (direction, clmxBsm) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/clxx/move',
+        method: 'post',
+        params: {
+            direction: direction,
+            clmxBsm: clmxBsm
+        }
+    })
+}
+/**
 * @description: 材料导入
 * @param {*} data
 * @author: renchao
--- a/src/views/components/imagePreview.vue
View file @f920770
+++ b/src/views/components/imagePreview.vue
View file @f920770
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-13 09:10:29
+ * @LastEditTime: 2023-09-13 15:36:42
 -->
 <template>
  <div class="rlPopup">
@@ -53,7 +53,7 @@
 <script>
  import PhotoZoom from '@/components/PhotoZoom'
  import { getAltimeterInfo, getUuid } from '@/utils/operation.js'
-  import { uploadBatch, deleteClmx } from "@/api/clxx.js";
+  import { uploadBatch, deleteClmx, move } from "@/api/clxx.js";
  import publicPicture from '@/components/publicPicture/index.vue'
  export default {
    name: 'PreviewImage',
@@ -141,7 +141,22 @@
      },
      // 左右移动
      handleMove (direction) {
+        move(direction, this.previewImg.imgList[this.previewImg.index].bsmClmx).then(res => {
+          if (res.code == 200) {
+            if (direction == 'left') {
+              this.previewImg.index = this.previewImg.index - 1
+            } else {
+              this.previewImg.index = this.previewImg.index + 1
+            }
+            this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj })
+            this.$message({
+              message: '移动成功!',
+              type: 'success'
+            })
+          } else {
+            this.$message.error(res.message);
+          }
+        })
      },
      /**
       * @description: 拍照
--- a/src/views/workflow/components/dialog/zslq.vue
View file @f920770
+++ b/src/views/workflow/components/dialog/zslq.vue
View file @f920770
          <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-28 12:53:50
+ * @LastEditTime: 2023-09-13 16:13:54
 -->
 <template>
  <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
@@ -22,7 +22,6 @@
        </el-form-item>
      </el-col>
    </el-row>
    <lb-table :column="tableData.columns" @row-dblclick="handleRowClick" ref="table" @selection-change="handleSelectionChange"
      :data="tableData.data"
      :pagination="false"
@@ -30,26 +29,26 @@
    </lb-table>
    <el-row>
      <el-col :span="6">
-        <el-form-item label="领证人" prop="lzrxm">
+        <el-form-item label="领证人" prop="qlrmc">
-          <el-input v-model="ruleForm.lzrxm"></el-input>
+          <el-input v-model="ruleForm.qlrmc"></el-input>
        </el-form-item>
      </el-col>
      <el-col :span="6">
-        <el-form-item label="证件类型" prop="lzrzjlb">
+        <el-form-item label="证件类型" prop="zjzl">
-          <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
+          <el-select v-model="ruleForm.zjzl" filterable clearable placeholder="请选择">
            <el-option v-for="item in zjzlData" :key="item.dcode" :label="item.dname" :value="item.dcode">
            </el-option>
          </el-select>
        </el-form-item>
      </el-col>
      <el-col :span="6">
-        <el-form-item label="证件号" prop="lzrzjh">
+        <el-form-item label="证件号" prop="zjh">
-          <el-input v-model="ruleForm.lzrzjh"></el-input>
+          <el-input v-model="ruleForm.zjh"></el-input>
        </el-form-item>
      </el-col>
      <el-col :span="6">
-        <el-form-item label="领证人电话" prop="lzrdh">
+        <el-form-item label="领证人电话" prop="dh">
-          <el-input v-model="ruleForm.lzrdh"></el-input>
+          <el-input v-model="ruleForm.dh"></el-input>
        </el-form-item>
      </el-col>
    </el-row>
@@ -63,7 +62,7 @@
  import Vue from 'vue'
  import store from '@/store/index.js'
  import table from "@/utils/mixin/table";
-  import { getUnclaimedBdcqz, issueCertificate } from "@/api/bdcqz.js";
+  import { getUnclaimedBdcqz, issueCertificate,getBdcqzQlr } from "@/api/bdcqz.js";
  import { datas } from "../../javascript/fzxxdata";
  export default {
    props: {
@@ -83,22 +82,22 @@
          fzsj: '',
          fzsl: '',
          bdcqzList: [],
-          lzrxm: '',
+          qlrmc: '',
-          lzrzjlb: '',
+          zjzl: '',
-          lzrzjh: '',
+          zjh: '',
-          lzrdh: ''
+          dh: ''
        },
        rules: {
-          lzrxm: [
+          qlrmc: [
            { required: true, message: '请输入领证人', trigger: 'blur' }
          ],
-          lzrzjlb: [
+          zjzl: [
            { required: true, message: '请选择证件类型', trigger: 'change' }
          ],
-          lzrzjh: [
+          zjh: [
            { required: true, message: '请输入证件号', trigger: 'blur' }
          ],
-          lzrdh: [
+          dh: [
            { required: true, message: '请输入电话号码', trigger: 'blur' }
          ]
        },
@@ -133,6 +132,18 @@
            this.ruleForm.fzsj = res.result.fzsj
            this.ruleForm.fzsl = res.result.fzsl
            this.ruleForm.bdcqzList = res.result.list;
+            res.result.list.length && this.getQlr(res.result.list[0].bsmBdcqz)
+          }
+        })
+      },
+      /**
+       * @description: 获取权利人信息
+       * @author: renchao
+       */
+      getQlr (bsmBdcqz) {
+        getBdcqzQlr(bsmBdcqz).then(res => {
+          if (res.code === 200) {
+            this.ruleForm = {...this.ruleForm,...res.result} 
          }
        })
      },
--- a/src/views/ywbl/slsqxx/fdcq1/slxx.vue
View file @f920770
+++ b/src/views/ywbl/slsqxx/fdcq1/slxx.vue
View file @f920770
 <!--
 * @Description: 房屋多幢受理信息
 * @Autor: ssq
- * @LastEditTime: 2023-09-12 09:55:25
+ * @LastEditTime: 2023-09-13 14:41:34
 -->
 <template>
  <div class="slxx">
@@ -69,7 +69,7 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="坐落：">
-              <el-input maxlength="100" v-model="ruleForm.sldy.zl"></el-input>
+              <el-input maxlength="100" disabled v-model="ruleForm.sldy.zl"></el-input>
            </el-form-item>
          </el-col>
        </el-row>