Merge branch 'dev'

@@ -8,28 +8,36 @@ let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('Ap
 
 // 初始化内容
 export function Init (data) {
+    return request({
+        url: SERVER.SERVERAPI + "/rest/ywbl/zjgcdy/init",
+        method: 'post',
+        data
+    })
+}
+// 批量初始化内容
+export function bacthInit (data) {
     let apiUrl = "";
     switch (data.get("djlx")) {
         case "100":
-            apiUrl = "/rest/ywbl/zjgcdy/fristInit";
+            apiUrl = "/rest/ywbl/zjgcdy/fristBatchInit";
             break;
         case "200":
-            apiUrl = "/rest/ywbl/zjgcdy/transferInit";
+            apiUrl = "/rest/ywbl/zjgcdy/transferBatchInit";
             break;
         case "300":
-            apiUrl = "/rest/ywbl/zjgcdy/changeInit";
+            apiUrl = "/rest/ywbl/zjgcdy/changeBatchInit";
             break;
         case "400":
-            apiUrl = "/rest/ywbl/zjgcdy/logoutInit";
+            apiUrl = "/rest/ywbl/zjgcdy/logoutBatchInit";
             break;
         case "500":
-            apiUrl = "/rest/ywbl/zjgcdy/riviseInit";
+            apiUrl = "/rest/ywbl/zjgcdy/riviseBatchInit";
             break;
         case "901":
-            apiUrl = "/rest/ywbl/zjgcdy/renewalInit";
+            apiUrl = "/rest/ywbl/zjgcdy/renewaBatchlInit";
             break;
         case "902":
-            apiUrl = "/rest/ywbl/zjgcdy/replaceInit";
+            apiUrl = "/rest/ywbl/zjgcdy/replaceBatchInit";
             break;
     }
     return request({
@@ -51,6 +59,15 @@ export function saveData (data, djlx) {
     })
 }
 
+// 受理信息保存
+export function saveBatchData (data, djlx) {
+    return request({
+        url: SERVER.SERVERAPI + "/rest/ywbl/zjgcdy/saveBatchData",
+        method: 'post',
+        data
+    })
+}
+
 // 流程图
 export function getWorkFlowImage (bsmSlsq, bestepid) {
     return request({

+<!--
+ * @Descripttion: 表格选择器组件
+ * @version: 1.3
+ * @Author: sakuya
+ * @Date: 2021年6月10日10:04:07
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-06-29 11:14:11
+-->
+
+<template>
+  <el-select ref="select" v-model="defaultValue" :size="size" :clearable="clearable" :multiple="multiple" :collapse-tags="collapseTags"
+    :collapse-tags-tooltip="collapseTagsTooltip" :filterable="filterable" :placeholder="placeholder" :disabled="disabled" :filter-method="filterMethod"
+    @remove-tag="removeTag" @visible-change="visibleChange" @clear="clear">
+    <template #empty>
+      <div class="sc-table-select__table" :style="{width: tableWidth+'px'}" v-loading="loading">
+        <div class="sc-table-select__header">
+          <slot name="header" :form="formData" :submit="formSubmit"></slot>
+        </div>
+        <el-table ref="table" :data="tableData" :height="245" :highlight-current-row="!multiple" @row-click="click" @select="select" @select-all="selectAll">
+          <el-table-column v-if="multiple" type="selection" width="45"></el-table-column>
+          <el-table-column v-else type="index" width="45">
+            <template #default="scope"><span>{{scope.$index+(currentPage - 1) * pageSize + 1}}</span></template>
+          </el-table-column>
+          <slot></slot>
+        </el-table>
+        <div class="sc-table-select__page">
+          <el-pagination small background layout="prev, pager, next" :total="total" :page-size="pageSize" v-model:currentPage="currentPage"
+            @current-change="reload"></el-pagination>
+        </div>
+      </div>
+    </template>
+  </el-select>
+</template>
+
+<script>
+  import config from "./tableSelect";
+  export default {
+    props: {
+      modelValue: null,
+      apiObj: { type: Object, default: () => { } },
+      placeholder: { type: String, default: "请选择" },
+      size: { type: String, default: "small" },
+      clearable: { type: Boolean, default: false },
+      multiple: { type: Boolean, default: false },
+      filterable: { type: Boolean, default: false },
+      collapseTags: { type: Boolean, default: false },
+      collapseTagsTooltip: { type: Boolean, default: false },
+      disabled: { type: Boolean, default: false },
+      tableWidth: { type: Number, default: 400 },
+      mode: { type: String, default: "popover" },
+      props: { type: Object, default: () => { } }
+    },
+    data () {
+      return {
+        loading: false,
+        keyword: null,
+        defaultValue: [],
+        tableData: [],
+        pageSize: config.pageSize,
+        total: 0,
+        currentPage: 1,
+        defaultProps: {
+          label: config.props.label,
+          value: config.props.value,
+          page: config.request.page,
+          pageSize: config.request.pageSize,
+          keyword: config.request.keyword
+        },
+        formData: {}
+      }
+    },
+    computed: {
+
+    },
+    watch: {
+      modelValue: {
+        handler () {
+          this.defaultValue = this.modelValue
+          this.autoCurrentLabel()
+        },
+        deep: true
+      }
+    },
+    mounted () {
+      this.defaultProps = Object.assign(this.defaultProps, this.props);
+      this.defaultValue = this.modelValue
+      this.autoCurrentLabel()
+    },
+    methods: {
+      //表格显示隐藏回调
+      visibleChange (visible) {
+        if (visible) {
+          this.currentPage = 1
+          this.keyword = null
+          this.formData = {}
+          this.getData()
+        } else {
+          this.autoCurrentLabel()
+        }
+      },
+      //获取表格数据
+      async getData () {
+        this.loading = true;
+        var reqData = {
+          [this.defaultProps.page]: this.currentPage,
+          [this.defaultProps.pageSize]: this.pageSize,
+          [this.defaultProps.keyword]: this.keyword
+        }
+        Object.assign(reqData, this.formData)
+        // var res = await this.apiObj.get(reqData);
+        let res = {
+          code: 200,
+          data: {
+            total: 2, rows: [
+              {
+                user: 11111111111,
+                id: 111111111111
+              },
+              {
+                user: 2222222222222,
+                id: 22222222222
+              }
+            ]
+          },
+          message: ""
+        }
+        var parseData = config.parseData(res)
+        this.tableData = parseData.rows;
+        this.total = parseData.total;
+        this.loading = false;
+        //表格默认赋值
+        this.$nextTick(() => {
+          if (this.multiple) {
+            this.defaultValue.forEach(row => {
+              var setrow = this.tableData.filter(item => item[this.defaultProps.value] === row[this.defaultProps.value])
+              if (setrow.length > 0) {
+                this.$refs.table.toggleRowSelection(setrow[0], true);
+              }
+            })
+          } else {
+            var setrow = this.tableData.filter(item => item[this.defaultProps.value] === this.defaultValue[this.defaultProps.value])
+            this.$refs.table.setCurrentRow(setrow[0]);
+          }
+          this.$refs.table.setScrollTop(0)
+        })
+      },
+      //插糟表单提交
+      formSubmit () {
+        this.currentPage = 1
+        this.keyword = null
+        this.getData()
+      },
+      //分页刷新表格
+      reload () {
+        this.getData()
+      },
+      //自动模拟options赋值
+      autoCurrentLabel () {
+        this.$nextTick(() => {
+          if (this.multiple) {
+            this.$refs.select.selected.forEach(item => {
+              item.currentLabel = item.value[this.defaultProps.label]
+            })
+          } else {
+            this.$refs.select.selectedLabel = this.defaultValue[this.defaultProps.label]
+          }
+        })
+      },
+      //表格勾选事件
+      select (rows, row) {
+        var isSelect = rows.length && rows.indexOf(row) !== -1
+        if (isSelect) {
+          this.defaultValue.push(row)
+        } else {
+          this.defaultValue.splice(this.defaultValue.findIndex(item => item[this.defaultProps.value] == row[this.defaultProps.value]), 1)
+        }
+        this.autoCurrentLabel()
+        this.$emit('update:modelValue', this.defaultValue);
+        this.$emit('change', this.defaultValue);
+      },
+      //表格全选事件
+      selectAll (rows) {
+        var isAllSelect = rows.length > 0
+        if (isAllSelect) {
+          rows.forEach(row => {
+            var isHas = this.defaultValue.find(item => item[this.defaultProps.value] == row[this.defaultProps.value])
+            if (!isHas) {
+              this.defaultValue.push(row)
+            }
+          })
+        } else {
+          this.tableData.forEach(row => {
+            var isHas = this.defaultValue.find(item => item[this.defaultProps.value] == row[this.defaultProps.value])
+            if (isHas) {
+              this.defaultValue.splice(this.defaultValue.findIndex(item => item[this.defaultProps.value] == row[this.defaultProps.value]), 1)
+            }
+          })
+        }
+        this.autoCurrentLabel()
+        this.$emit('update:modelValue', this.defaultValue);
+        this.$emit('change', this.defaultValue);
+      },
+      click (row) {
+        if (this.multiple) {
+          //处理多选点击行
+        } else {
+          this.defaultValue = row
+          this.$refs.select.blur()
+          this.autoCurrentLabel()
+          this.$emit('update:modelValue', this.defaultValue);
+          this.$emit('change', this.defaultValue);
+        }
+      },
+      //tags删除后回调
+      removeTag (tag) {
+        var row = this.findRowByKey(tag[this.defaultProps.value])
+        this.$refs.table.toggleRowSelection(row, false);
+        this.$emit('update:modelValue', this.defaultValue);
+      },
+      //清空后的回调
+      clear () {
+        this.$emit('update:modelValue', this.defaultValue);
+      },
+      // 关键值查询表格数据行
+      findRowByKey (value) {
+        return this.tableData.find(item => item[this.defaultProps.value] === value)
+      },
+      filterMethod (keyword) {
+        if (!keyword) {
+          this.keyword = null;
+          return false;
+        }
+        this.keyword = keyword;
+        this.getData()
+      },
+      // 触发select隐藏
+      blur () {
+        this.$refs.select.blur();
+      },
+      // 触发select显示
+      focus () {
+        this.$refs.select.focus();
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .sc-table-select__table {
+    padding: 12px;
+  }
+  .sc-table-select__page {
+    padding-top: 12px;
+  }
+</style>

+/*
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-06-29 11:05:49
+ */
+//表格选择器配置
+
+export default {
+  pageSize: 10,						//表格每一页条数
+  parseData: function (res) {
+    return {
+      data: res.data,
+      rows: res.data.rows,		//分析行数据字段结构
+      total: res.data.total,		//分析总数字段结构
+      msg: res.message,			//分析描述字段结构
+      code: res.code				//分析状态字段结构
+    }
+  },
+  request: {
+    page: 'page',					//规定当前分页字段
+    pageSize: 'pageSize',			//规定一页条数字段
+    keyword: 'keyword'				//规定搜索字段
+  },
+  props: {
+    label: 'label',					//映射label显示字段
+    value: 'value',					//映射value值字段
+  }
+}

@@ -56,7 +56,7 @@ router.beforeEach(async (to, from, next) => {
       await store.dispatch('user/getUserInfo')
       router.addRoutes([...accessRoutes, { path: '*', redirect: '/404', hidden: true }])
       const routeTo = Cookies.get('routerTo')
-      if (routeTo && routeTo !== '/') {
+      if (to.fullPath||routeTo && routeTo !== '/') {
         next({ ...to, replace: true })
       } else {
         next('/home')

@@ -9,7 +9,7 @@
     <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
       <el-row>
         <el-col :span="8">
-          <el-form-item label="权利人类型" prop="sqrlx">
+          <el-form-item label="权利人类型1" prop="sqrlx">
             <el-select clearable v-model="ruleForm.sqrlx" class="width100" placeholder="请选择">
               <el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode">
               </el-option>

+<!--
+ * @Description:
+ * @Autor: renchao
+ * @LastEditTime: 2023-05-17 10:39:47
+-->
+<template>
+  <dialogBox title="申请人信息" width="60%" isMain v-model="myValue" :isFullscreen="false" @submitForm="submitForm"
+    @closeDialog="closeDialog" :isButton="showButton">
+    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="义务人类型1" prop="sqrlx">
+            <el-select clearable v-model="ruleForm.sqrlx" class="width100" placeholder="请选择">
+              <el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="姓名/名称" prop="sqrmc">
+            <el-input v-model="ruleForm.sqrmc" maxlegth="15"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="证件种类" prop="zjzl">
+            <el-select clearable v-model="ruleForm.zjzl" class="width100" placeholder="请选择">
+              <el-option v-for="item in dictData['A30']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="证件号" prop="zjh">
+            <el-input v-model="ruleForm.zjh" maxlength="15" oninput="value=value.replace(/[^\X0-9]/g,'')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="联系电话" prop="dh">
+            <el-input v-model="ruleForm.dh" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="性别">
+            <el-select clearable v-model="ruleForm.xb" class="width100" placeholder="请选择">
+              <el-option v-for="item in dictData['A43']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="法人名称">
+            <el-input v-model="ruleForm.frmc"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="国家/地区">
+            <el-input v-model="ruleForm.gjdq"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="户籍所在省市">
+            <el-input v-model="ruleForm.szss"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="16">
+          <el-form-item label="地址">
+            <el-input v-model="ruleForm.txdz"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="邮编">
+            <el-input v-model="ruleForm.yb"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="发证机关">
+            <el-input v-model="ruleForm.fzjg"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="电子邮件">
+            <el-input v-model="ruleForm.dzyj"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="权利比例">
+            <el-input v-model="ruleForm.qlbl"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="工作单位">
+            <el-input v-model="ruleForm.gzdw"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <el-form-item label="代理机构">
+            <el-input v-model="ruleForm.dljg"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="联系电话">
+            <el-input v-model="ruleForm.lxdh" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="代理人姓名">
+            <el-input v-model="ruleForm.dlrxm"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="代理人证件类型">
+            <el-select clearable v-model="ruleForm.dlrzjlx" class="width100" placeholder="请选择">
+              <el-option v-for="item in dictData['A30']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="代理人证件号">
+            <el-input v-model="ruleForm.dlrzjh" maxlength="20"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </dialogBox>
+</template>
+<script>
+  import { mapGetters } from "vuex";
+  export default {
+    props: {
+      value: { type: Boolean, default: false },
+      details: { type: Object, default: {} },
+      showButton: { type: Boolean, default: false }
+    },
+    computed: {
+      ...mapGetters(["dictData"]),
+    },
+    data () {
+      return {
+        myValue: this.value,
+        ruleForm: {
+          sqrlx: "",
+          sqrmc: "",
+          zjzl: "",
+          zjh: "",
+          dh: "",
+          xb: "",
+          frmc: "",
+          gjdq: "",
+          szss: "",
+          txdz: "",
+          yb: "",
+          fzjg: "",
+          dzyj: "",
+          qlbl: "",
+          gzdw: "",
+          dljg: "",
+          dlrxm: "",
+          dlrzjlx: "",
+          dlrzjh: "",
+        },
+        rules: {
+          sqrlx: [{ required: true, message: "义务人类型", trigger: "change" }],
+          sqrmc: [{ required: true, message: "姓名/名称", trigger: "blur" }],
+          zjzl: [{ required: true, message: "证件种类", trigger: "change" }],
+          zjh: [{ required: true, message: "证件号", trigger: "blur" }],
+        },
+      };
+    },
+    watch: {
+      value (val) {
+        this.myValue = _.cloneDeep(val);
+      },
+      details: {
+        handler: function (val, oldVal) {
+          this.ruleForm = val;
+        },
+        deep: true,
+      },
+    },
+    methods: {
+      closeDialog () {
+        this.$emit("input", false);
+        this.$refs["ruleForm"].resetFields();
+      },
+      submitForm () {
+        this.$refs.ruleForm.validate((valid) => {
+          if (valid) {
+            this.$emit("input", false);
+            this.$emit("updateDetail", _.cloneDeep(this.ruleForm));
+          } else {
+            return false;
+          }
+        });
+      },
+    },
+  };
+</script>
+<style scoped lang="scss">
+  @import "~@/styles/dialogBoxheader.scss";
+  .submit-button {
+    text-align: center;
+    height: 52px;
+    padding-top: 10px;
+    background-color: #fff;
+  }
+</style>

@@ -4,7 +4,7 @@ import { log } from "bpmn-js-token-simulation";
 var qlxxPage = [
     { qllx: "A01", id: "jsydsyq", form: "jsydsyq.vue", label: "集体土地所有权" },
     { qllx: "A02", id: "jsydsyq", form: "jsydsyq.vue", label: "国家土地所有权" },
-    { qllx: "A03", id: "fdcq2", form: "jsydsyq.vue", label: "国有建设用地使用权" },
+    { qllx: "A03", id: "jsydsyq", form: "jsydsyq.vue", label: "国有建设用地使用权" },
     { qllx: "A04", id: "", form: "", label: "国有建设用地使用权/房屋所有权" },
     { qllx: "A05", id: "jsydsyq", form: "jsydsyq.vue", label: "宅基地使用权" },
     { qllx: "A06", id: "", form: "", label: "宅基地使用权/房屋所有权" },
@@ -75,12 +75,12 @@ export function getNode(qllx, qlxx, bdcdylx) {
                 if (bdcdylx == "4") {
                     node = { id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label};
                 } else {
+
                     node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label};
                 }
             } else {
               console.log("jin1111");
                 node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label};
-                console.log("nodenodenodenode",node);
             }
             break;
         }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-05-17 10:41:35
+ * @LastEditTime: 2023-05-17 10:41:20
 -->
 <template>
-  <lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableData">
+  <div>
+    <lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150"
+      :data="tableDataList">
     </lb-table>
+    <addYwr v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" />
+  </div>
 </template>
 <script>
-  import addQlr from './dialog/addQlr.vue'
+  import addYwr from './dialog/addYwr.vue'
   import { mapGetters } from 'vuex'
   export default {
     components: {
-      addQlr
+      addYwr
     },
     computed: {
       ...mapGetters(["dictData"]),
@@ -34,14 +38,16 @@
         key: 0,
         dataIndex: 0,
         dialog: false,
+        isaddupdate: false,
+        showButton: this.$route.query.viewtype ? false : true,
         details: {},
         tableDataList: [],
-        qlrCommonTable: [
+        InformationTable: [
           {
             width: '50',
             renderHeader: (h, scope) => {
               return <div> {
-                this.$route.query.viewtype == 1 ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.handleAdd() }}></i>
+                this.$route.query.viewtype == 1 ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.addClick() }}></i>
               }
               </div>
             },
@@ -50,19 +56,33 @@
                 <div>
                   {
                     this.$route.query.viewtype == 1 ? <span>{scope.$index + 1}</span> :
-                      <i class="el-icon-minus pointer" onClick={() => { this.handleMinus(scope.$index, scope.row) }}></i>
+                      <i class="el-icon-minus pointer" onClick={() => { this.deleClick(scope.$index, scope.row) }}></i>
                   }
                 </div>
               )
             }
           },
           {
+            label: '身份证读卡器',
+            align: 'center',
+            render: (h, scope) => {
+              return <el-button type="text" icon="el-icon-tickets" onClick={() => { this.readClick(scope) }}>读取</el-button>
+            }
+          },
+          {
             prop: "sqrmc",
             label: "姓名/名称"
           },
           {
             prop: "zjzl",
-            label: "证件种类"
+            label: "证件种类",
+            render: (h, scope) => {
+              return this.dictData['A30'] && this.dictData['A30'].map(option => {
+                if (option.dcode == scope.row.zjzl) {
+                  return <span>{option.dname}</span>
+                }
+              })
+            }
           },
           {
             prop: "zjh",
@@ -73,29 +93,32 @@
             label: "联系电话"
           },
           {
-            prop: "frmc",
-            label: "法人"
-          },
-          {
             label: '操作',
             render: (h, scope) => {
               return (
                 <div>
                   {
-                    <el-button icon="el-icon-view" type="text" onClick={() => { this.handleView(scope.$index, scope.row) }}>查看</el-button>
+                    this.$route.query.viewtype ? <el-button
+                      icon="el-icon-view"
+                      type="text"
+                      onClick={() => { this.queryViewClick(scope.$index, scope.row) }}>查看</el-button> : <el-button
+                        icon="el-icon-edit-outline"
+                        type="text"
+                        onClick={() => { this.editClick(scope.$index, scope.row) }}>编辑</el-button>
                   }
                 </div>
               )
             }
           }
         ],
-        column: this.qlrCommonTable
+        column: []
       }
     },
     watch: {
       tableData: {
         handler: function (val, oldVal) {
           let that = this
+          this.$nextTick(() => {
             if (val.length == 0 || !val) {
               that.tableDataList = _.cloneDeep([{
                 sqrmc: '',
@@ -106,16 +129,19 @@
             } else {
               that.tableDataList = _.cloneDeep(val)
             }
+          })
         },
         immediate: true,
         deep: true
       },
       gyfs: {
         handler (newVal, oldValue) {
-          let dataList = _.cloneDeep(this.qlrCommonTable)
-          if (newVal == '1') {
-            this.column = _.cloneDeep(dataList).slice(1, dataList.length)
-          } else if ((newVal == '2')) {
+          let dataList = _.cloneDeep(this.InformationTable)
+          if (newVal == 0) {
+            // this.column = _.cloneDeep(dataList).slice(1, dataList.length)
+            this.column = _.cloneDeep(dataList)
+
+          } else if ((newVal == '1' || newVal == '3')) {
             this.column = dataList
           } else {
             this.column = _.cloneDeep(dataList)
@@ -130,33 +156,66 @@
       }
     },
     methods: {
-      updateDetail (value) {
-        this.tableDataList[this.dataIndex] = value
-        this.key++
+      handleupdateDetail (value) {
+        if (this.isaddupdate) {
+          if (!_.isEqual(value, this.tableData)) {
+            this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
+            this.$emit('upDateQlrxxList', this.tableDataList)
+          }
+        } else {
+          if (!_.isEqual(value, this.tableData)) {
+            this.tableDataList[this.dataIndex] = _.cloneDeep(value);
             this.$emit('upDateQlrxxList', this.tableDataList)
+          }
+        }
+        this.key++
       },
-      // 添加
-      handleAdd () {
+      // 新增
+      addClick () {
+        if (this.gyfs == '0' && this.tableDataList.length > 0) {
+          this.$message.warning("当前共有方式为单独所有，无法添加多个权利人")
+        } else {
           this.dialog = true
+          this.isaddupdate = true
+        }
       },
-      // 减
-      handleMinus (index, row) {
+
+      // 删除
+      deleClick (index, row) {
+        this.$confirm('确定要删除吗, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
           this.tableData.splice(index, 1)
+        }).catch(() => {
+        });
       },
+
       // 身份证读取
       readClick () { },
+
       // 修改
-      handleEdit (index, row) {
-        console.log(row, 'rowrowrowrowrow');
+      editClick (index, row) {
+        //   popupDialog("申请人信息", "workflow/components/addYwr", {
+        //     showButton: this.$route.query.viewtype ? false : true,
+        //   dataIndex :index,
+        //  details :row,
+        //  isaddupdate :false
+        // });
         this.dataIndex = index
         this.dialog = true
         this.details = row
+        this.isaddupdate = false
       },
-      handleView () {
+      queryViewClick (index, row) {
+        //   popupDialog("申请人信息", "workflow/components/addYwr", {
+        //     showButton: this.$route.query.viewtype ? false : true,
+        //   details: row,
+        // });
         this.dialog = true
+        this.details = row
       }
     }
   }
 </script>
-<style scoped lang='scss'>
-</style>
\ No newline at end of file

@@ -338,7 +338,7 @@
 <script>
 import { mapGetters } from "vuex";
 import { init, save } from "@/api/djbbl.js";
-import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
+import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
 import tdytTable from "@/views/workflow/components/tdytTable";
 // import the component
 // import Treeselect from '@riophae/vue-treeselect'

@@ -38,7 +38,7 @@
           </el-col>
         </el-row>
         <div class="slxx_title title-block">
-          房地产权（独幢、层、套、间房屋）
+          国有建设用地使用权信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">
@@ -238,7 +238,7 @@
 import store from "@/store/index.js";
 import { mapGetters } from "vuex";
 import { init, save } from "@/api/djbbl.js";
-import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
+import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
 import tdytTable from "@/views/workflow/components/tdytTable";
 export default {
   components: { qlrCommonTable, tdytTable },

@@ -7,7 +7,6 @@
 export function getForm(tabName) {
   let form;
   switch (tabName) {
-
     case "zdjbxx":
       form = require("@/views/registerBook/zdjbxx.vue");
       break;

@@ -214,7 +214,7 @@ export default {
     },
     //切换选项卡内容组件
     getFromRouter(tabname) {
-      console.log("tabname", tabname);
+      console.log("tabnameeeeeeeeeeeeeeeeee", tabname,this.tabList);
       this.componentTag = getForm(tabname);
     },
     closefp() {

@@ -415,6 +415,19 @@ class data extends filter {
         {
           prop: "dybdclx",
           label: "抵押不动产类型",
+          render: (h, scope) => {
+            return (
+              <div>
+              <span v-show={scope.row.dybdclx == '1'}>土地</span>
+              <span v-show={scope.row.dybdclx == '2'}>土地和房屋</span>
+              <span v-show={scope.row.dybdclx == '3'}>林地和林木</span>
+              <span v-show={scope.row.dybdclx == '4'}>土地和在建建筑物</span>
+              <span v-show={scope.row.dybdclx == '5'}>海域</span>
+              <span v-show={scope.row.dybdclx == '6'}>海域和构筑物</span>
+              <span v-show={scope.row.dybdclx == '7'}>其它</span>
+              </div>
+            )
+          }
         },
         {
           prop: "djlxmc",
@@ -441,16 +454,8 @@ class data extends filter {
           label: "在建建筑物坐落",
         },
         {
-          prop: "dyfs",
+          prop: "dyfsmc",
           label: "抵押方式",         
-          render: (h, scope) => {
-            return (
-              <div>
-                <span v-show={scope.row.dyfs == '1'}>一般抵押权</span>
-                <span v-show={scope.row.dyfs == '2'}>最高额抵押权</span>
-              </div>
-            )
-          }
         },
         {
           prop: "qlrmc",

@@ -19,8 +19,8 @@
       margin-top: 15px;
       line-height: 24px;
       font-size: 18px;">根据《不动产登记暂行条例》和《不动产登记资料查询暂行办法》
-      有关规定，经线上查询不动产登记信息系统，权利人： 杜林
-      ，证件号：612322197805120010，截止{{newDatez}}
+      有关规定，经线上查询不动产登记信息系统，权利人： {{form.cxjgListp[0].qlrmc}}
+      ，证件号：{{form.cxjgListp[0].zjhm}}，截止{{newDatez}}
       ，名下不动产登记信息查询结果如下：</p>
     <table style=" border-collapse: collapse;
       width: 100%;

-<!--
- * @Description:
- * @Autor: renchao
- * @LastEditTime: 2023-04-26 16:05:28
--->
-<template>
-  <div class='batchDel'>
-    <lb-table :column="columns" :data="formData.dataList" :maxHeight="460" :heightNumSetting="true" :pagination="false"
-      @selection-change="handleSelectionChange">
-    </lb-table>
-    <div class="text-center">
-      <el-button @click="$popupCacel">取消</el-button>
-      <el-button type="primary" @click="submitdelclick" plain>确定</el-button>
-    </div>
-  </div>
-</template>
-<script>
-  import { deleteFlow } from "@/api/ywbl.js"
-  import store from '@/store/index.js'
-  export default {
-    components: {},
-    props: {
-      formData: {
-        type: Object,
-        default: {}
-      }
-    },
-    data () {
-      return {
-        columns: [
-          {
-            type: 'selection',
-            label: '全选'
-          },
-          {
-            label: '序号',
-            type: 'index',
-            width: '50',
-          },
-          {
-            prop: "bdcdyh",
-            label: "不动产单元号",
-          },
-          {
-            prop: "zl",
-            label: "坐落",
-          },
-        ],
-        dataList: [],
-        selectBdcdy: [],
-      }
-    },
-    methods: {
-      // 批量删除确定按钮
-      submitdelclick () {
-        var formdata = new FormData();
-        formdata.append("bsmSldyList", this.selectBdcdy);
-        formdata.append("bsmSlsq", this.formData.bsmSlsq);
-        deleteFlow(formdata).then(res => {
-          if (res.code == 200) {
-            this.$popupCacel();
-            store.dispatch('user/refreshPage', true);
-            this.$message.success("删除成功");
-          } else {
-            this.$message.error(res.message)
-          }
-        })
-      },
-      // 批量删除勾选事件
-      handleSelectionChange (e) {
-        this.selectBdcdy = [];
-        e.forEach((item, index) => {
-          this.selectBdcdy.push(item.bsmSldy)
-        })
-      }
-    }
-  }
-</script>
-<style scoped lang='scss'>
-</style>

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-06-25 10:33:16
+ * @LastEditTime: 2023-06-30 14:32:40
 -->
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
     <!-- 表单部分 -->
     <el-tabs v-model="activeName" @tab-click="handleClick" v-if="headTabBdcqz.length >1">
-      <el-tab-pane :label="item.qlr + '(' + item.bdcqzh + ')'" :name="item.bdcqzlx"
-        v-for="(item, index) in headTabBdcqz" :key="index"></el-tab-pane>
+      <el-tab-pane :label="item.qlr + (item.bdcqzh !== null ? '(' + item.bdcqzh + ')' : '')" :name="item.bsmBdcqz"
+        v-for="(item, index) in headTabBdcqz" :key="index">
+      </el-tab-pane>
     </el-tabs>
     <div class="no-data" v-if="headTabBdcqz.length == 0">暂无数据</div>
-    <canvas ref="zs" width="1000" v-show="activeName=='1'" height="700"></canvas>
-    <canvas ref="zm" width="1180" v-show="activeName!='1'" height="780"></canvas>
+    <canvas ref="zs" width="1000" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx==1" height="700"></canvas>
+    <canvas ref="zm" width="1180" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx!=1" height="780"></canvas>
   </div>
 </template>
 
@@ -49,13 +50,14 @@
         ruleForm: {
           bsmBdcqz: '',
           szmc: '不动产权证书',
-          bdcqzlx: '',
+          bsmBdcqz: '',
           szzh: '',
           ysxlh: '',
         },
       }
     },
     mounted () {
+      debugger
       this.columns = datas.columns();
       if (this.formData.bdcqz) {
         //从缮证进入
@@ -77,10 +79,10 @@
         getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then(res => {
           if (res.code == 200) {
             if (res.result && res.result.length > 0) {
-              this.activeName = res.result[0].bdcqzlx
+              this.activeName = res.result[0].bsmBdcqz
               this.bdcqz = res.result[0]
               this.headTabBdcqz = res.result
-              if (this.activeName == 1) {
+              if (res.result[0].bdcqzlx == 1) {
                 this.drawTextOnImage()
               } else {
                 this.drawTextzmImage()
@@ -93,7 +95,7 @@
       //tab表头切换方法
       handleClick (e) {
         this.bdcqz = this.headTabBdcqz[e.index - 0]
-        this.activeName = this.headTabBdcqz.bdcqzlx
+        this.activeName = this.headTabBdcqz.bsmBdcqz
         if (this.activeName == '1') {
           this.drawTextOnImage()
         } else {
@@ -157,6 +159,15 @@
           context.drawImage(image, 0, 0);
           context.font = '18px 楷体';
           context.fillStyle = '#000000';
+          // ysxlh
+          context.fillText(this.bdcqz.ysxlh ? this.bdcqz.ysxlh : '', 280, 712);
+          // djsj
+          if (this.bdcqz.djsj) {
+            let djsjList = this.bdcqz.djsj.split(' ')[0].split('/')
+            context.fillText(djsjList[0] ? djsjList[0] : '', 327, 580);
+            context.fillText(djsjList[1] ? djsjList[1] : '', 393, 580);
+            context.fillText(djsjList[2] ? djsjList[2] : '', 443, 580);
+          }
           context.fillText(this.bdcqz.sjjc ? this.bdcqz.sjjc : '', 620, 125);
           context.fillText(this.bdcqz.djnd ? this.bdcqz.djnd : '', 665, 125);
           context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 750, 125);
@@ -191,7 +202,7 @@
             });
           });
           // fj
-          context.fillText(this.bdcqz.fj ? this.bdcqz.fj : '', 775, 650);
+          context.fillText(this.bdcqz.fj ? this.bdcqz.fj : '', 775, 600);
         };
 
         image.src = this.bdczmSrc;

@@ -107,18 +107,20 @@ export default {
         switch (qllx) {
           case 'A04':
             this.showBatch = true;
-            this.batchButtonName = '批量单元信息';
+            this.batchButtonName = '房屋批量操作';
             break;
           case 'B39':
             this.showBatch = true;
-            this.batchButtonName = '批量查封清单信息';
+            this.batchButtonName = '查封批量操作';
             break;
           case 'A37':
             this.showBatch = true;
-            this.batchButtonName = '批量抵押';
+            this.batchButtonName = '抵押批量操作';
+            break;
+          case 'B37':
+            this.showBatch = true;
+            this.batchButtonName = '在建工程抵押批量操作';
             break;
-          default:
-            this.batchButtonName = '批量操作';
         }
       }
     },

 <!--
- * @Description: 权利人列表
- * @Autor: miaofang
- * @LastEditTime: 2023-06-14 10:40:48
+ * @Description:
+ * @Autor: renchao
+ * @LastEditTime: 2023-05-17 10:40:48
 -->
 <template>
   <lb-table :column="column" :maxHeight="200" :heightNumSetting="true" :pagination="false" :key="key" :data="tableData">
@@ -49,29 +49,33 @@
               )
             }
           },
+          //  {
+          //   prop: "bdcdyh",
+          //   label: "不动产单元号"
+          // },
            {
-            prop: "qllxmc",
-            label: "权利类型"
+            prop: "zl",
+            label: "坐落"
            },
           {
-            prop: "bdcqzh",
-            label: "不动产权证号"
+            prop: "shbw",
+            label: "室号部位"
           },     
            {
-            prop: "qlrmc",
-            label: "权利人"
+            prop: "fwxzmc",
+            label: "房屋性质"
           },
             {
-            prop: "ytmc",
-            label: "用途"
+            prop: "jzmj",
+            label: "建筑面积"
           },
           {
-            prop: "mj",
-            label: "面积"
+            prop: "showfwyt",
+            label: "房屋用途"
           }, 
            {
-            prop: "zl",
-            label: "坐落"
+            prop: "showfwjg",
+            label: "房屋结构"
           },      
         ],
         column: this.qlrCommonTable
@@ -80,14 +84,8 @@
     watch: {
       tableData: {
         handler: function (val, oldVal) {
-          let that = this
+          let that = this;
           if (val.length == 0 || !val) {
-            that.tableDataList = _.cloneDeep([{
-              sqrmc: '',
-              dlrzjlx: '',
-              dlrzjh: '',
-              fr: ''
-            }])
           } else {
             that.tableDataList = _.cloneDeep(val)
           }

@@ -4,7 +4,7 @@
  * @LastEditTime: 2023-06-19 13:16:53
  */
 //流程环节操作按钮
-export function getForm (tabName, djywbm) {
+export function getForm(tabName, djywbm) {
   let form;
   switch (tabName) {
     case "tdsyqslxx":
@@ -31,7 +31,6 @@ export function getForm (tabName, djywbm) {
     case "nydsyqslxx100":
       form = require("@/views/ywbl/slsqxx/nydsyq/slxx.vue");
       break;
-
     case "nydsyqslxx200":
       form = require("@/views/ywbl/slsqxx/nydsyq/slxx200.vue");
       break;
@@ -66,6 +65,9 @@ export function getForm (tabName, djywbm) {
     case "zjgcdyqSlxx":
       form = require("@/views/ywbl/slsqxx/zjgcdy/slxx.vue");
       break;
+    case "batchZjgcdyq":
+      form = require("@/views/ywbl/slsqxx/zjgcdy/batchSlxx.vue");
+      break;
     case "cfdjxx":
       form = require("@/views/registerBook/cfdj.vue");
       break;

@@ -55,51 +55,51 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="权利人：">
-              <el-input disabled v-model="ruleForm.ssQlxx.qlrmc"></el-input>
+              <el-input disabled v-model="ruleForm.ztQlxx.qlrmc"></el-input>
             </el-form-item>
           </el-col>         
           <el-col :span="8">
-            <el-form-item label="证件号：">
-              <el-input disabled v-model="ruleForm.ssQlxx.qlrzjhm"></el-input>
+            <el-form-item label="证件种类：">
+              <el-input disabled v-model="ruleForm.ztQlxx.qlrzjzl"></el-input>
             </el-form-item>
           </el-col>
            <el-col :span="8">
-            <el-form-item label="证件种类：">
-              <el-input disabled v-model="ruleForm.ssQlxx.qlrzjzl"></el-input>
+            <el-form-item label="证件号：">
+              <el-input disabled v-model="ruleForm.ztQlxx.qlrzjhm"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="权利类型：">
-              <el-input disabled v-model="ruleForm.ssQlxx.qllxmc"></el-input>
+              <el-input disabled v-model="ruleForm.ztQlxx.qllxmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="不动产权证号：">
-              <el-input disabled v-model="ruleForm.ssQlxx.bdcqzh"></el-input>
+              <el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="坐落：">
-              <el-input disabled v-model="ruleForm.ssQlxx.zl"></el-input>
+              <el-input disabled v-model="ruleForm.ztQlxx.zl"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="不动产单元号：">
-              <el-input disabled v-model="ruleForm.ssQlxx.bdcdyh"></el-input>
+              <el-input disabled v-model="ruleForm.ztQlxx.bdcdyh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="面积：">
-              <el-input disabled v-model="ruleForm.ssQlxx.mj"></el-input>
+              <el-input disabled v-model="ruleForm.ztQlxx.mj"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="用途：">
-              <el-input disabled v-model="ruleForm.ssQlxx.ytmc"></el-input>
+              <el-input disabled v-model="ruleForm.ztQlxx.ytmc"></el-input>
             </el-form-item>
           </el-col>
         </el-row>

@@ -32,12 +32,12 @@
         <el-row :gutter="10" v-if="ruleForm.slsq">
           <el-col :span="8">
             <el-form-item label="权利类型：">
-              <el-input disabled v-model="ruleForm.sldy.qllxmc"></el-input>
+              <el-input disabled v-model="ruleForm.sldyList[0].qllxmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="登记类型：">
-              <el-input disabled v-model="ruleForm.sldy.djlxmc"></el-input>
+              <el-input disabled v-model="ruleForm.sldyList[0].djlxmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -102,7 +102,7 @@
           <el-col :span="14">
             <el-form-item label="共有方式：">
               <el-radio-group :disabled="$route.query.viewtype == 1" @change="showCZInfo"
-                              v-model="ruleForm.sldy.gyfs">
+                              v-model="ruleForm.sldyList[0].gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -114,13 +114,13 @@
 
           <el-col :span="5" v-show=" ruleForm.slsq.gyfs == '2'">
             <el-form-item label="是否分别持证：">
-              <el-radio-group v-model="ruleForm.sldy.sqfbcz">
+              <el-radio-group v-model="ruleForm.sldyList[0].sqfbcz">
                 <el-radio label="1">是</el-radio>
                 <el-radio label="0">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="5" v-show="ruleForm.sldy.gyfs == '2'">
+          <el-col :span="5" v-show="ruleForm.sldyList[0].gyfs == '2'">
             <el-form-item label="持证人：">
               <el-select v-model="ruleForm.slsq.czr" placeholder="持证人">
                 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
@@ -192,6 +192,7 @@ export default {
         ,qlxxList:[]//权利信息集合
         ,sldyList:[]//受理不动产单元集合
         ,slsq: {}//受理申请流程明细
+        ,flow: {}//受理申请流程明细
         ,sqrList:[]//申请人
         ,ssQlxxList:[]//上手权利信息
         ,user:{}//用户

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-05-25 08:59:02
+ * @LastEditTime: 2023-06-29 11:13:35
 -->
 <template>
   <!-- 受理信息 -->
@@ -131,6 +131,15 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8">
+            <el-form-item label="下拉表格测试：">
+              <select-table v-model="value2" :table-width="600" :props="props" @change="change">
+                <el-table-column prop="id" label="ID" width="180"></el-table-column>
+                <el-table-column prop="user" label="姓名"></el-table-column>
+              </select-table>
+            </el-form-item>
+          </el-col>
+
         </el-row>
 
         <div class="slxx_title title-block">
@@ -203,7 +212,9 @@
   import { mapGetters } from "vuex"
   import { Init, saveData } from "@/api/workflow/tdsyqFlow.js"
   import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"
+  import selectTable from '@/components/selectTable/index.vue'
   export default {
+    components: { qlrCommonTable, selectTable },
     mounted () {
       this.ableOperation = this.$parent.currentSelectTab.ableOperation
       this.propsParam = this.$attrs;
@@ -222,12 +233,22 @@
         })
       })
     },
-    components: { qlrCommonTable },
+
     computed: {
       ...mapGetters(["dictData", "flag"])
     },
     data () {
       return {
+        value2: {
+          id: "520000198407304275",
+          user: "史平"
+        },
+        props: {
+          label: 'user',
+          value: 'id',
+          keyword: "keyword"
+        },
+
         //表单是否可操作
         ableOperation: true,
         key: 0,
@@ -241,6 +262,7 @@
       }
     },
     methods: {
+      change () { },
       // 更新权利人信息
       upDateQlrxxList (val) {
         this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val))

@@ -43,41 +43,40 @@
           </el-col>
         </el-row>
         <div class="slxx_title title-block">
-          抵押房屋信息情况
+          抵押户信息情况
           <div class="triangle"></div>
         </div>
-
         <el-row :gutter="10">
           <el-col :span="8">
-            <el-form-item label="权利人：">
-              <el-input disabled v-model="ruleForm.qlxx.qlrmc"></el-input>
+            <el-form-item label="房屋用途：">
+              <el-input disabled v-model="ruleForm.qjh.showfwyt"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="证件号：">
-              <el-input disabled v-model="ruleForm.qlxx.qlrzjhm"></el-input>
+            <el-form-item label="房屋性质：">
+              <el-input disabled v-model="ruleForm.qjh.fwxzmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="证件种类：">
-              <el-input disabled v-model="ruleForm.qlxx.qlrzjzl"></el-input>
+            <el-form-item label="房屋结构：">
+              <el-input disabled v-model="ruleForm.qjh.showfwjg"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
-            <el-form-item label="权利类型：">
-              <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
+            <el-form-item label="建筑面积：">
+              <el-input disabled v-model="ruleForm.qjh.jzmj"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="不动产权证号：">
-              <el-input disabled v-model="ruleForm.qlxx.bdcqzh"></el-input>
+            <el-form-item label="套内建筑面积：">
+              <el-input disabled v-model="ruleForm.qjh.tnjzmj"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="坐落：">
-              <el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
+            <el-form-item label="分摊建筑面积：">
+              <el-input disabled v-model="ruleForm.qjh.ftjzmj"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -88,13 +87,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="面积：">
-              <el-input disabled v-model="ruleForm.qlxx.mj"></el-input>
+            <el-form-item label="室号部位：">
+              <el-input disabled v-model="ruleForm.qjh.shbw"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="用途：">
-              <el-input disabled v-model="ruleForm.qlxx.ytmc"></el-input>
+            <el-form-item label="坐落：">
+              <el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -128,12 +127,20 @@
           <el-col :span="8" v-show="ruleForm.diyaq.dyfs == 1">
             <el-form-item label="被担保主债权数额：">
               <el-input v-model="ruleForm.diyaq.bdbzzqse"></el-input>
+              <el-select v-model="ruleForm.diyaq.jedw" :disabled="$route.query.viewtype == '1'">
+                  <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                  </el-option>
+                </el-select>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-show="ruleForm.diyaq.dyfs == 2">
             <el-form-item label="最高债权额：">
               <el-input v-model="ruleForm.diyaq.zgzqse"></el-input>
+              <el-select v-model="ruleForm.diyaq.jedw" :disabled="$route.query.viewtype == '1'">
+                  <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                  </el-option>
+                </el-select>
             </el-form-item>
           </el-col>
 
@@ -254,14 +261,13 @@
       var formdata = new FormData();
       this.$startLoading();
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
-      formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
       formdata.append("djlx", this.propsParam.djlx);
       formdata.append("isEdit", this.ableOperation);
       Init(formdata).then((res) => {
         if (res.code === 200 && res.result) {
           this.ruleForm = res.result;
           this.$endLoading();
-          this.ruleForm.diyaq.sfczjzhxz = "0";
+          //this.ruleForm.diyaq.sfczjzhxz = "0";
         }
       })
     },
@@ -275,12 +281,7 @@
         ableOperation: true,
         disabled: true,
         czrOptions: [],
-        ruleForm: {
-          slywxx: {},
-          qlxxold: {},
-          diyaq: {},
-          gyfs: "",
-        },
+        ruleForm: {},
         //传递参数
         propsParam: {},
         rules: {},

@@ -192,6 +192,19 @@
         this.queryClick();
       },
       ywhClick (item) {
+         //有任务权限
+               if(item.sjlx=="3"){
+               const { href } = this.$router.resolve(
+                  "/djbworkFrame?bsmSlsq=" +
+                item.bsmSlsq +
+                "&bestepid=" +
+                item.bestepid +
+                "&bsmBusiness=" +
+                "&sqywbm=" +
+                item.djywbm
+              );
+               window.open(href, `urlname${item.bsmSlsq}`);
+              }else{
                     const { href } = this.$router.resolve(
           "/workFrameView?bsmSlsq=" +
           item.bsmSlsq +
@@ -201,6 +214,9 @@
           "&viewtype=1"
         );
         window.open(href, `urlname${item.bsmSlsq}`);
+              }
+
+
       },
     },
   };