Merge branch 'dev'

renchao@pashanhoo.com
Showing 28 changed files with 1958 additions and 1498 deletions
src/store/modules/workflow.js
src/views/djbworkflow/components/leftmenu/djbFrameData.js
src/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue
src/views/djbworkflow/djbBook/components/blxxtabs/dyaq.vue
src/views/djbworkflow/djbBook/components/blxxtabs/dyiq.vue
src/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue
src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
src/views/djbworkflow/djbBook/components/blxxtabs/tdsyq.vue
src/views/djbworkflow/djbBook/components/blxxtabs/ygdj.vue
src/views/djbworkflow/djbBook/components/blxxtabs/yydj.vue
src/views/djbworkflow/djbBook/spyj.vue
src/views/djbworkflow/flowform.js
src/views/djbworkflow/mixin/index.js
src/views/djbworkflow/workFrame.vue
src/views/jkfw/ptjk/components/addDialog.vue
src/views/jkfw/ptjk/ptjk.vue
src/views/login/index.vue
src/views/lpb/index.vue
src/views/registerBook/bdcqldjml.vue
src/views/registerBook/bdcqljqtsx.vue
--- a/src/store/modules/workflow.js
View file @1814739
+++ b/src/store/modules/workflow.js
View file @1814739
 /*
- * @Description: 
+ * @Description:
 * @Autor: renchao
 * @LastEditTime: 2023-05-04 11:13:36
 */
 const state = {
-  yjsqOptions: {},
+  yjsqOptions: "",
 }
 const mutations = {
--- a/src/views/djbworkflow/components/leftmenu/djbFrameData.js
View file @1814739
+++ b/src/views/djbworkflow/components/leftmenu/djbFrameData.js
View file @1814739
@@ -2,8 +2,8 @@ import { log } from "bpmn-js-token-simulation";
 var qlxxPage = [
-    { qllx: "A01", id: "jsydsyq", form: "jsydsyq.vue", label: "集体土地所有权" },
+    { qllx: "A01", id: "tdsyq", form: "tdsyq.vue", label: "集体土地所有权" },
-    { qllx: "A02", id: "jsydsyq", form: "jsydsyq.vue", label: "国家土地所有权" },
+    { qllx: "A02", id: "tdsyq", form: "tdsyq.vue", label: "国家土地所有权" },
    { qllx: "A03", id: "jsydsyq", form: "jsydsyq.vue", label: "国有建设用地使用权" },
    { qllx: "A04", id: "", form: "", label: "国有建设用地使用权/房屋所有权" },
    { qllx: "A05", id: "jsydsyq", form: "jsydsyq.vue", label: "宅基地使用权" },
@@ -79,7 +79,6 @@ export function getNode(qllx, qlxx, bdcdylx) {
                    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};
            }
            break;
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue
View file @1814739
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue
View file @1814739
@@ -15,6 +15,7 @@
      :inline="flag"
      label-width="145px"
      inline-message
+      :show-message="false"
       :class="{readonly: editDisabled }"
       class="loadingtext"
    >
@@ -209,7 +210,7 @@
              </el-select>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
            <el-form-item
              label="不动产权证号："
              prop="qlxx.bdcqzh"
@@ -217,7 +218,7 @@
            >
              <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
            </el-form-item>
-          </el-col>
+          </el-col> -->
          <el-col :span="8">
            <el-form-item label="查封机关：">
              <el-input v-model="ruleForm.cfdj.cfjg"></el-input>
@@ -260,7 +261,7 @@
              <el-input v-model="ruleForm.cfdj.cffw"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
            <el-form-item
              label="区县代码："
              prop="qlxx.qxdm"
@@ -268,7 +269,7 @@
            >
              <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
            </el-form-item>
-          </el-col>
+          </el-col> -->
          <el-col :span="8">
            <el-form-item
              label="登记机构："
@@ -310,6 +311,7 @@
            </el-form-item>
          </el-col>
        </el-row>
+        <el-row :gutter="10">
        <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
          <el-form-item label="解封业务号：">
            <el-input v-model="ruleForm.cfdj.jfywh"></el-input>
@@ -340,6 +342,7 @@
            <el-input v-model="ruleForm.cfdj.jfdjsj"></el-input>
          </el-form-item>
        </el-col>
+        </el-row>
      </div>
      <el-row class="btn" v-if="ableOperation">
        <el-form-item>
@@ -442,12 +445,12 @@ export default {
      ztQlxxList: [],
      rules: {
        bdcqzhrules: [
-          { required: true, message: "不动产权证号：", trigger: "change" },
+          { required: true, message: "不动产权证号：", trigger: "blur" },
        ],
        qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
-        djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
+        djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
        dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
-        djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
+        djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
      },
    };
  },
@@ -473,12 +476,14 @@ export default {
      }
    },
    loadData() {
+       this.$startLoading();
      this.propsParam.isEdit = this.$parent.isEdit;
      init(this.propsParam).then((res) => {
        if (res.code == 200) {
          this.ruleForm = res.result;
          this.isShow = true;
          let djlx = this.ruleForm.qlxx.djlx;
+          this.$endLoading();
          if (djlx == null || djlx == 100) {
            this.ssqlxxshow = false;
          }
@@ -500,22 +505,22 @@ export default {
        }
      });
    },
-    // 更新土地用途信息
+    // // 更新土地用途信息
-    upDateTdytxxList(val) {
+    // upDateTdytxxList(val) {
-      this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
+    //   this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
-      this.key++;
+    //   this.key++;
-    },
+    // },
-    // 更新权利人信息
+    // // 更新权利人信息
-    upDateQlrxxList(val) {
+    // upDateQlrxxList(val) {
-      this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
+    //   this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
-      this.czrOptions = this.ruleForm.qlrData;
+    //   this.czrOptions = this.ruleForm.qlrData;
-      this.key++;
+    //   this.key++;
-    },
+    // },
-    // 更新义务人信息
+    // // 更新义务人信息
-    upDateYwrxxList(val) {
+    // upDateYwrxxList(val) {
-      this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
+    //   this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
-      this.key++;
+    //   this.key++;
-    },
+    // },
    onSubmit() {
      this.$refs.ruleForm.validate((valid) => {
        console.log("valid", valid);
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/dyaq.vue
View file @1814739
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/dyaq.vue
View file @1814739
@@ -9,13 +9,14 @@
    <el-form
      :model="ruleForm"
      :rules="rules"
-         :class="{readonly: editDisabled }"
+      :class="{ readonly: editDisabled }"
-       class="loadingtext"
+      class="loadingtext"
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
      label-width="169px"
      inline-message
+      :show-message="false"
    >
      <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
        <div class="slxx_title title-block">
@@ -167,7 +168,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
-            <el-form-item label="登记类型：">
+            <el-form-item label="登记类型：" prop="qlxx.djlx" :rules="rules.djlxrules">
              <el-select v-model="ruleForm.qlxx.djlx" @change="djlxchange">
                <el-option
                  v-for="item in djlxlist"
@@ -259,6 +260,7 @@
            </el-form-item>
          </el-col>
        </el-row>
+        <el-row :gutter="10">
        <el-col :span="8">
          <el-form-item label="抵押面积：">
            <div style="display: flex">
@@ -279,11 +281,15 @@
          </el-form-item>
        </el-col>
        <el-col :span="8">
-          <el-form-item label="债务履行起始时间：" prop="diyaq.zwlxqssj" :rules="rules.zwlxqssjrules">
+          <el-form-item
+            label="债务履行起始时间："
+            prop="diyaq.zwlxqssj"
+            :rules="rules.zwlxqssjrules"
+          >
            <el-date-picker
              v-model="ruleForm.diyaq.zwlxqssj"
              type="date"
-            placeholder="选择日期"
+              placeholder="选择日期"
              value-format="yyyy-MM-dd HH:mm:ss"
              format="yyyy-MM-dd"
            >
@@ -291,17 +297,23 @@
          </el-form-item>
        </el-col>
        <el-col :span="8">
-          <el-form-item label="债务履行结束时间：" prop="diyaq.zwlxjssj" :rules="rules.zwlxjssjrules">
+          <el-form-item
+            label="债务履行结束时间："
+            prop="diyaq.zwlxjssj"
+            :rules="rules.zwlxjssjrules"
+          >
            <el-date-picker
              v-model="ruleForm.diyaq.zwlxjssj"
              type="date"
-             placeholder="选择日期"
+              placeholder="选择日期"
              value-format="yyyy-MM-dd HH:mm:ss"
              format="yyyy-MM-dd"
            >
            </el-date-picker>
          </el-form-item>
        </el-col>
+         </el-row>
+         <el-row :gutter="10">
        <el-col :span="8">
          <el-form-item label="在建建筑物坐落：">
            <el-input v-model="ruleForm.qlxx.zl"></el-input>
@@ -312,11 +324,15 @@
            <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
          </el-form-item>
        </el-col> -->
-        <el-col :span="8">
+        <!-- <el-col :span="8">
-          <el-form-item label="区县代码：" prop="qlxx.qxdm" :rules="rules.qxdmrules">
+          <el-form-item
+            label="区县代码："
+            prop="qlxx.qxdm"
+            :rules="rules.qxdmrules"
+          >
            <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
          </el-form-item>
-        </el-col>
+        </el-col> -->
        <el-col :span="8">
          <el-form-item label="在建建筑物抵押范围：">
            <el-input v-model="ruleForm.diyaq.zjjzwdyfw"></el-input>
@@ -353,23 +369,39 @@
          </el-form-item>
        </el-col>
        <el-col :span="8">
-          <el-form-item label="不动产登记证明号：" prop="qlxx.bdcqzh" :rules="rules.bdcqzhrules">
+          <el-form-item
+            label="不动产登记证明号："
+            prop="qlxx.bdcqzh"
+            :rules="rules.bdcqzhrules"
+          >
            <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
-          <el-form-item label="登记机构：" prop="qlxx.djjg" :rules="rules.djjgrules">
+          <el-form-item
+            label="登记机构："
+            prop="qlxx.djjg"
+            :rules="rules.djjgrules"
+          >
            <el-input v-model="ruleForm.qlxx.djjg"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
-          <el-form-item label="登簿人：" prop="qlxx.dbr" :rules="rules.dbrrules">
+          <el-form-item
+            label="登簿人："
+            prop="qlxx.dbr"
+            :rules="rules.dbrrules"
+          >
            <el-input v-model="ruleForm.qlxx.dbr"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
-          <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
+          <el-form-item
+            label="登记时间："
+            prop="qlxx.djsj"
+            :rules="rules.djsjrules"
+          >
            <el-date-picker
              v-model="ruleForm.qlxx.djsj"
              type="date"
@@ -415,7 +447,11 @@
        </el-col>
        <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
-          <el-form-item label="注销时间：" prop="qlxx.zxsj" :rules="rules.zxsjrules">
+          <el-form-item
+            label="注销时间："
+            prop="qlxx.zxsj"
+            :rules="rules.zxsjrules"
+          >
            <el-date-picker
              v-model="ruleForm.qlxx.zxsj"
              type="date"
@@ -427,23 +463,36 @@
          </el-form-item>
        </el-col>
        <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
-          <el-form-item label="注销登簿人：" prop="qlxx.zxdbr" :rules="rules.zxdbrrules">
+          <el-form-item
+            label="注销登簿人："
+            prop="qlxx.zxdbr"
+            :rules="rules.zxdbrrules"
+          >
            <el-input v-model="ruleForm.qlxx.zxdbr"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="24" v-if="ruleForm.qlxx.qszt == '2'">
-          <el-form-item label="注销抵押原因：" prop="diyaq.zxdyyy" :rules="rules.zxdyyyrules">
+          <el-form-item
+            label="注销抵押原因："
+            prop="diyaq.zxdyyy"
+            :rules="rules.zxdyyyrules"
+          >
            <el-input v-model="ruleForm.diyaq.zxdyyy"></el-input>
          </el-form-item>
        </el-col>
+          </el-row>
        <div class="slxx_title title-block">
          权利人信息
          <div class="triangle"></div>
        </div>
        <el-row :gutter="10">
-          <el-col :span="12">
+          <el-col :span="14">
            <el-form-item label="共有方式：">
-              <el-radio-group v-model="ruleForm.qlxx.gyqk">
+              <el-radio-group
+                 :disabled="!ableOperation"
+                v-model="ruleForm.qlxx.gyfs"
+              >
                <el-radio label="0">单独所有</el-radio>
                <el-radio label="1">共同共有</el-radio>
                <el-radio label="2">按份所有</el-radio>
@@ -494,7 +543,7 @@ export default {
  computed: {
    ...mapGetters(["dictData", "flag"]),
    // 根据流程判断表单是否为只读
-      editDisabled() {
+    editDisabled() {
      if (!this.ableOperation) {
        //只读状态
        return true;
@@ -557,7 +606,7 @@ export default {
      ],
      ssQlxxList: [],
      ztQlxxList: [],
-      ableOperation:false,
+      ableOperation: false,
      rules: {
        bdcqzhrules: [
          { required: true, message: "不动产登记证明号", trigger: "blur" },
@@ -570,20 +619,24 @@ export default {
          { required: true, message: "债务履行结束时间", trigger: "blur" },
        ],
-        zxdyyyrules: [{ required: true, message: "注销抵押原因", trigger: "blur" }],
+        zxdyyyrules: [
+          { required: true, message: "注销抵押原因", trigger: "blur" },
+        ],
        zxsjrules: [{ required: true, message: "注销时间", trigger: "blur" }],
-        zxdbrrules: [{ required: true, message: "注销登簿人", trigger: "blur" }],
+        zxdbrrules: [
+          { required: true, message: "注销登簿人", trigger: "blur" },
+        ],
        djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
        dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
        djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
+        djlxrules: [{ required: true, message: "登记类型", trigger: "blur" }],
      },
    };
  },
-  created() {
+  created() {},
-    this.loadData();
-  },
  mounted() {
-     this.ableOperation=this.$parent.ableOperation
+    this.loadData();
+    this.ableOperation = this.$parent.ableOperation;
  },
  methods: {
    ztQlxxchange(val) {
@@ -601,10 +654,12 @@ export default {
      }
    },
    loadData() {
+      this.$startLoading();
      this.propsParam.isEdit = this.$parent.isEdit;
      init(this.propsParam).then((res) => {
        if (res.code == 200) {
          this.ruleForm = res.result;
+          this.$endLoading();
          this.isShow = true;
          let djlx = this.ruleForm.qlxx.djlx;
          if (djlx == null || djlx == 100) {
@@ -655,7 +710,14 @@ export default {
            });
            return false;
          }
+            if (this.ruleForm.ywrData.length == 0) {
+            this.$message({
+              showClose: true,
+              message: "请确认义务人信息",
+              type: "error",
+            });
+            return false;
+          }
          if (this.ruleForm.qlxx.gyfs == "0") {
            if (this.ruleForm.qlrData.length > 1) {
              this.$message({
@@ -717,5 +779,4 @@ export default {
 .el-table__row {
  height: 30px !important;
 }
 </style>
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/dyiq.vue
View file @1814739
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/dyiq.vue
View file @1814739
@@ -14,7 +14,7 @@
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
-      inline-message
+      :show-message="false"
      label-width="150px"
    >
      <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
@@ -43,6 +43,34 @@
          地役权信息
          <div class="triangle"></div>
        </div>
+           <el-row :gutter="10" class="ssqlxx">
+          <el-col :span="24" v-if="ssqlxxshow">
+            <el-form-item label="上手权利信息：">
+              <select-table
+                v-model="ruleForm.ssQlxx"
+                :table-width="550"
+                :tableData="ssQlxxList"
+                :props="props"
+                @change="ssQlxxchange"
+              >
+                <el-table-column
+                  prop="qllxmc"
+                  width="130"
+                  label="权利类型"
+                ></el-table-column>
+                <el-table-column
+                  prop="bdcqzh"
+                  width="160"
+                  label="不动产权证书"
+                ></el-table-column>
+                <el-table-column prop="qlrmc" label="权利人"></el-table-column>
+                <el-table-column prop="mjmc" label="面积"></el-table-column>
+                <el-table-column prop="ytmc" label="用途"></el-table-column>
+                <el-table-column prop="zl" label="坐落"></el-table-column>
+              </select-table>
+            </el-form-item>
+          </el-col>
+        </el-row>
        <el-row :gutter="10">
          <el-col :span="8">
            <el-form-item label="不动产单元号：">
@@ -56,7 +84,7 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="上手业务号：">
-              <el-input v-model="ruleForm.qlxx.ssywh"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -72,8 +100,8 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
-            <el-form-item label="登记类型：">
+            <el-form-item label="登记类型： " prop="qlxx.djlx" :rules="rules.djlxrules">
-              <el-select v-model="ruleForm.qlxx.djlx">
+              <el-select v-model="ruleForm.qlxx.djlx" @change="djlxchange">
                <el-option
                  v-for="item in djlxlist"
                  :key="item.dcode"
@@ -94,11 +122,11 @@
              <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
            <el-form-item label="区县代码：" prop="qlxx.qxdm" :rules="rules.qxdmrules">
              <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
            </el-form-item>
-          </el-col>
+          </el-col> -->
          <el-col :span="8">
            <el-form-item label="登记机构：" prop="qlxx.djjg" :rules="rules.djjgrules">
              <el-input v-model="ruleForm.qlxx.djjg"></el-input>
@@ -232,7 +260,10 @@
        <el-row :gutter="10">
          <el-col :span="12">
            <el-form-item label="共有方式：">
-              <el-radio-group v-model="ruleForm.qlxx.gyqk">
+              <el-radio-group
+                 :disabled="!ableOperation"
+                v-model="ruleForm.qlxx.gyfs"
+              >
                <el-radio label="0">单独所有</el-radio>
                <el-radio label="1">共同共有</el-radio>
                <el-radio label="2">按份所有</el-radio>
@@ -273,13 +304,13 @@
 </template>
 <script>
 import { mapGetters } from "vuex";
-import { init, save } from "@/api/djbRepair.js";
+import { init,getSsQlxx, save } from "@/api/djbRepair.js";
-import { getSjlx, getDictLeabel } from "@/utils/dictionary.js";
 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
 import tdytTable from "@/views/workflow/components/tdytTable";
+import selectTable from "@/components/selectTable/index.vue";
 export default {
-  components: { qlrCommonTable, ywrCommonTable, tdytTable },
+  components: { qlrCommonTable, ywrCommonTable, tdytTable ,selectTable },
  computed: {
    ...mapGetters(["dictData", "flag"]),
    // 根据流程判断表单是否为只读
@@ -293,12 +324,18 @@ export default {
  },
  data() {
    return {
+       ssqlxxshow:true,
+        props: {
+        label: "bdcqzh",
+        value: "bdcdyid",
+      },
      //表单是否可操作
      propsParam: this.$attrs,
      key: 0,
      isShow: false,
      disabled: true,
      czrOptions: [],
+       ssQlxxList: [],
      ruleForm: {},
      // 登记类型
      djlxlist: [
@@ -343,30 +380,59 @@ export default {
      //传递参数\
        rules: {
          bdcqzhrules:[
-            { required: true, message: "不动产登记证明号", trigger: "change" },
+            { required: true, message: "不动产登记证明号", trigger: "blur" },
          ],
        qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
-        djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
+        djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
        dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
-        djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
+        djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
+        djlxrules: [{ required: true, message: "登记类型", trigger: "blur" }],
      },
    };
  },
  created() {
-    this.loadData();
  },
  mounted() {
+       this.loadData();
     this.ableOperation=this.$parent.ableOperation
  },
  methods: {
+           ssQlxxchange(val) {
+      this.ruleForm.ssQlxx = val;
+      this.ruleForm.qlxx.ssywh = val.ssywh;
+    },
+       djlxchange(val) {
+      console.log("val",val);
+      if (val == null || val == 100) {
+        this.ssqlxxshow = false;
+      } else {
+        this.ssqlxxshow = true;
+      }
+    },
    loadData() {
+      this.$startLoading();
      this.propsParam.isEdit = this.$parent.isEdit;
      init(this.propsParam).then((res) => {
        if (res.code == 200) {
          this.ruleForm = res.result;
+         let djlx = this.ruleForm.qlxx.djlx;
+          if (djlx == null || djlx == 100) {
+            this.ssqlxxshow = false;
+          }
+           this.$endLoading();
          this.isShow = true;
        }
      });
+             //获取主体信息
+      getSsQlxx({
+        bdcdyid: this.propsParam.bdcdyid,
+        qllx: this.propsParam.qllx,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.ssQlxxList = res.result;
+        }
+      });
    },
    // 更新土地用途信息
    upDateTdytxxList(val) {
@@ -395,7 +461,14 @@ export default {
        });
        return false;
      }
+      if (this.ruleForm.ywrData.length == 0) {
+            this.$message({
+              showClose: true,
+              message: "请确认义务人信息",
+              type: "error",
+            });
+            return false;
+          }
      if (this.ruleForm.qlxx.gyfs == "0") {
        if (this.ruleForm.qlrData.length > 1) {
          this.$message({
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue
View file @1814739
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue
View file @1814739
@@ -9,11 +9,12 @@
    <el-form
      :model="ruleForm"
      :rules="rules"
-         :class="{readonly: editDisabled }"
+      :class="{ readonly: editDisabled }"
-       class="loadingtext"
+      class="loadingtext"
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
+      :show-message="false"
      inline-message
      label-width="145px"
    >
@@ -24,7 +25,7 @@
        </div>
        <el-row :gutter="10">
          <el-col :span="8">
-            <el-form-item label="补录编号11：">
+            <el-form-item label="补录编号：">
              <el-input disabled v-model="ruleForm.repair.ywh"></el-input>
            </el-form-item>
          </el-col>
@@ -43,6 +44,34 @@
          房地产权（独幢、层、套、间房屋）
          <div class="triangle"></div>
        </div>
+          <el-row :gutter="10" class="ssqlxx">
+          <el-col :span="24" v-if="ssqlxxshow">
+            <el-form-item label="上手权利信息：">
+              <select-table
+                v-model="ruleForm.ssQlxx"
+                :table-width="550"
+                :tableData="ssQlxxList"
+                :props="props"
+                @change="ssQlxxchange"
+              >
+                <el-table-column
+                  prop="qllxmc"
+                  width="130"
+                  label="权利类型"
+                ></el-table-column>
+                <el-table-column
+                  prop="bdcqzh"
+                  width="160"
+                  label="不动产权证书"
+                ></el-table-column>
+                <el-table-column prop="qlrmc" label="权利人"></el-table-column>
+                <el-table-column prop="mjmc" label="面积"></el-table-column>
+                <el-table-column prop="ytmc" label="用途"></el-table-column>
+                <el-table-column prop="zl" label="坐落"></el-table-column>
+              </select-table>
+            </el-form-item>
+          </el-col>
+        </el-row>
        <el-row :gutter="10">
          <el-col :span="8">
            <el-form-item label="不动产单元号：">
@@ -56,7 +85,7 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="上手业务号：">
-              <el-input v-model="ruleForm.qlxx.ssywh"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -67,8 +96,8 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
-            <el-form-item label="登记类型：">
+            <el-form-item label="登记类型：" prop="qlxx.djlx" :rules="rules.djlxrules">
-              <el-select v-model="ruleForm.qlxx.djlx">
+              <el-select v-model="ruleForm.qlxx.djlx" @change="djlxchange">
                <el-option
                  v-for="item in djlxlist"
                  :key="item.dcode"
@@ -104,7 +133,7 @@
            <el-form-item label="土地性质：" style="margin-bottom: 3px">
              <treeselect
                v-model="tdxz"
-                 noOptionsText="暂无数据"
+                noOptionsText="暂无数据"
                placeholder=""
                :normalizer="normalizer"
                :show-count="true"
@@ -131,10 +160,15 @@
              </div>
            </el-form-item>
          </el-col>
-              <el-col :span="8">
+          <el-col :span="8">
            <el-form-item label="权属状态：">
              <el-select v-model="ruleForm.qlxx.qszt">
-                <el-option v-for="item in qsztlist" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                <el-option
+                  v-for="item in qsztlist"
+                  :key="item.dcode"
+                  :label="item.dname"
+                  :value="item.dcode"
+                >
                </el-option>
              </el-select>
            </el-form-item>
@@ -176,7 +210,11 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
-            <el-form-item label="房屋结构：" prop="fdcq2.fwjg"  :rules="rules.fwjgrules">
+            <el-form-item
+              label="房屋结构："
+              prop="fdcq2.fwjg"
+              :rules="rules.fwjgrules"
+            >
              <el-select v-model="ruleForm.fdcq2.fwjg">
                <el-option
                  v-for="item in dictData['A46']"
@@ -220,27 +258,47 @@
          </el-col>
          <el-col :span="8">
-            <el-form-item label="不动产权证号：" prop="qlxx.bdcqzh"  :rules="rules.bdcqzhrules">
+            <el-form-item
+              label="不动产权证号："
+              prop="qlxx.bdcqzh"
+              :rules="rules.bdcqzhrules"
+            >
              <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
-            <el-form-item label="区县代码：" prop="qlxx.qxdm" :rules="rules.qxdmrules">
+            <el-form-item
+              label="区县代码："
+              prop="qlxx.qxdm"
+              :rules="rules.qxdmrules"
+            >
              <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
            </el-form-item>
-          </el-col>
+          </el-col> -->
          <el-col :span="8">
-            <el-form-item label="登记机构：" prop="qlxx.djjg" :rules="rules.djjgrules">
+            <el-form-item
+              label="登记机构："
+              prop="qlxx.djjg"
+              :rules="rules.djjgrules"
+            >
              <el-input v-model="ruleForm.qlxx.djjg"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
-            <el-form-item label="登簿人：" prop="qlxx.dbr" :rules="rules.dbrrules">
+            <el-form-item
+              label="登簿人："
+              prop="qlxx.dbr"
+              :rules="rules.dbrrules"
+            >
              <el-input v-model="ruleForm.qlxx.dbr"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
-            <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
+            <el-form-item
+              label="登记时间："
+              prop="qlxx.djsj"
+              :rules="rules.djsjrules"
+            >
              <el-date-picker
                v-model="ruleForm.qlxx.djsj"
                type="date"
@@ -282,8 +340,9 @@
        <el-row :gutter="10">
          <el-col :span="12">
            <el-form-item label="共有方式：">
-              <el-radio-group
+            <el-radio-group
-                v-model="ruleForm.qlxx.gyqk"
+                 :disabled="!ableOperation"
+                v-model="ruleForm.qlxx.gyfs"
              >
                <el-radio label="0">单独所有</el-radio>
                <el-radio label="1">共同共有</el-radio>
@@ -292,30 +351,6 @@
              </el-radio-group>
            </el-form-item>
          </el-col>
-          <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
-            <el-form-item label="是否分别持证：">
-              <el-radio-group v-model="ruleForm.qlxx.sqfbcz">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col> -->
-          <!-- <el-col
-            :span="6"
-            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'"
-          >
-            <el-form-item label="持证人：">
-              <el-select v-model="ruleForm.czr" placeholder="持证人">
-                <el-option
-                  v-for="item in czrOptions"
-                  :key="item.zjh"
-                  :label="item.sqrmc"
-                  :value="item.zjh"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
        </el-row>
        <qlrCommonTable
          :tableData="ruleForm.qlrData"
@@ -335,19 +370,20 @@
 </template>
 <script>
 import { mapGetters } from "vuex";
-import { init, save } from "@/api/djbRepair.js";
+import { init,getSsQlxx, save } from "@/api/djbRepair.js";
 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
+import selectTable from "@/components/selectTable/index.vue";
 import tdytTable from "@/views/workflow/components/tdytTable";
 // import the component
 // import Treeselect from '@riophae/vue-treeselect'
 //   // import the styles
 // import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
-  components: { qlrCommonTable, tdytTable },
+  components: { qlrCommonTable, tdytTable,selectTable},
  computed: {
    ...mapGetters(["dictData", "flag"]),
    // 根据流程判断表单是否为只读
-      editDisabled() {
+    editDisabled() {
      if (!this.ableOperation) {
        //只读状态
        return true;
@@ -357,6 +393,11 @@ export default {
  },
  data() {
    return {
+      ssqlxxshow:true,
+      props: {
+        label: "bdcqzh",
+        value: "bdcdyid",
+      },
      // 键名转换，方法默认是label和children进行树状渲染
      normalizer(node) {
        //方法
@@ -371,7 +412,7 @@ export default {
      //表单是否可操作
      propsParam: this.$attrs,
-           // 登记类型
+      // 登记类型
      djlxlist: [
        {
          dcode: "100",
@@ -411,47 +452,75 @@ export default {
        },
      ],
      key: 0,
-      tdxz:null,
+      tdxz: null,
      isShow: false,
      disabled: true,
      czrOptions: [],
+       ssQlxxList: [],
      ruleForm: {},
-       ableOperation:false,
+      ableOperation: false,
-     //传递参数\
+      //传递参数\
-         rules: {
+      rules: {
+        bdcqzhrules: [
-          bdcqzhrules:[
+          { required: true, message: "不动产权证号：", trigger: "blur" },
-            { required: true, message: "不动产权证号：", trigger: "change" },
+        ],
-          ],
+        // qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
-        qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
+        djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
-        djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
        dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
-        djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
+        djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
-        fwjgrules: [{ required: true, message: "房屋结构", trigger: "change" }],
+        fwjgrules: [{ required: true, message: "房屋结构", trigger: "blur" }],
+         djlxrules: [{ required: true, message: "登记类型", trigger: "blur" }],
      },
    };
  },
-  created() {
+  created() {},
-    this.loadData();
-  },
  mounted() {
-     this.ableOperation=this.$parent.ableOperation
+    this.loadData();
+    this.ableOperation = this.$parent.ableOperation;
  },
  methods: {
-    loadData() {
+       ssQlxxchange(val) {
+      this.ruleForm.ssQlxx = val;
+      this.ruleForm.qlxx.ssywh = val.ssywh;
+    },
+    djlxchange(val) {
+      console.log("val",val);
+      if (val == null || val == 100) {
+        this.ssqlxxshow = false;
+      } else {
+        this.ssqlxxshow = true;
+      }
+    },
-      this.propsParam.isEdit=this.$parent.isEdit
+    loadData() {
+      this.$startLoading();
+      this.propsParam.isEdit = this.$parent.isEdit;
      init(this.propsParam).then((res) => {
        if (res.code == 200) {
          this.ruleForm = res.result;
-         if( this.ruleForm.tdytqxList.length>0){
+           let djlx = this.ruleForm.qlxx.djlx;
-            this.tdxz=this.ruleForm.tdytqxList[0].qlxzbm
+          if (djlx == null || djlx == 100) {
-          }else{
+            this.ssqlxxshow = false;
-            this.tdxz=null
+          }
+          this.$endLoading();
+          if (this.ruleForm.tdytqxList.length > 0) {
+            this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
+          } else {
+            this.tdxz = null;
          }
          this.isShow = true;
        }
      });
+        //获取主体信息
+      getSsQlxx({
+        bdcdyid: this.propsParam.bdcdyid,
+        qllx: this.propsParam.qllx,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.ssQlxxList = res.result;
+        }
+      });
    },
    // 更新土地用途信息
    upDateTdytxxList(val) {
@@ -470,87 +539,94 @@ export default {
      this.key++;
    },
    onSubmit() {
-       this.$refs.ruleForm.validate((valid) => {
+      this.$refs.ruleForm.validate((valid) => {
        if (valid) {
-      if (this.ruleForm.qlrData.length == 0) {
+          if (this.ruleForm.qlrData.length == 0) {
-        this.$message({
+            this.$message({
-          showClose: true,
+              showClose: true,
-          message: "请确认权利人信息",
+              message: "请确认权利人信息",
-          type: "error",
+              type: "error",
-        });
+            });
-        return false;
+            return false;
-      }
+          }
-       if( this.ruleForm.tdytqxList.length==0&&!this.tdxz){
+          if (this.ruleForm.ywrData.length == 0) {
-          this.$message({
+            this.$message({
-          showClose: true,
+              showClose: true,
-          message: "请补充土地用途信息",
+              message: "请确认义务人信息",
-          type: "error",
+              type: "error",
-        });
+            });
-        return false;
+            return false;
-       }
+          }
-        if(!this.tdxz){
+          if (this.ruleForm.tdytqxList.length == 0 && !this.tdxz) {
-          this.$message({
+            this.$message({
-          showClose: true,
+              showClose: true,
-          message: "请补充土地性质",
+              message: "请补充土地用途信息",
-          type: "error",
+              type: "error",
-        });
+            });
-        return false;
+            return false;
-       }
+          }
-    this.ruleForm.tdytqxList = this.ruleForm.tdytqxList.map((item) => {
+          if (!this.tdxz) {
-      return{
+            this.$message({
-        ...item,
+              showClose: true,
-        qlxzbm:this.tdxz
+              message: "请补充土地性质",
-      }
+              type: "error",
-    })
+            });
-      if (this.ruleForm.qlxx.gyfs == "0") {
+            return false;
-        if (this.ruleForm.qlrData.length > 1) {
+          }
-          this.$message({
+          this.ruleForm.tdytqxList = this.ruleForm.tdytqxList.map((item) => {
-            showClose: true,
+            return {
-            message: "共有方式：单独所有，权利人只能是一个人",
+              ...item,
-            type: "error",
+              qlxzbm: this.tdxz,
+            };
          });
-          return false;
+          if (this.ruleForm.qlxx.gyfs == "0") {
-        }
+            if (this.ruleForm.qlrData.length > 1) {
-        this.ruleForm.qlrData[0].sfczr = "1";
+              this.$message({
-      }
+                showClose: true,
-      // if (this.ruleForm.qlxx.gyfs == "1") {
+                message: "共有方式：单独所有，权利人只能是一个人",
-      //   //是否分别持证
+                type: "error",
-      //   if (this.ruleForm.qlxx.sqfbcz == "1") {
+              });
-      //     //是
+              return false;
-      //     this.ruleForm.qlrData.forEach((item, index) => {
+            }
-      //       item.sfczr = "1";
+            this.ruleForm.qlrData[0].sfczr = "1";
-      //     });
+          }
-      //   } else {
+          // if (this.ruleForm.qlxx.gyfs == "1") {
-      //     this.ruleForm.qlrData.forEach((item, index) => {
+          //   //是否分别持证
-      //       if (item.zjh == this.ruleForm.czr) {
+          //   if (this.ruleForm.qlxx.sqfbcz == "1") {
-      //         item.sfczr = "1";
+          //     //是
-      //       } else {
+          //     this.ruleForm.qlrData.forEach((item, index) => {
-      //         item.sfczr = "0";
+          //       item.sfczr = "1";
-      //       }
+          //     });
-      //     });
+          //   } else {
-      //   }
+          //     this.ruleForm.qlrData.forEach((item, index) => {
-      // }
+          //       if (item.zjh == this.ruleForm.czr) {
-      save(this.ruleForm).then((res) => {
+          //         item.sfczr = "1";
-        if (res.code === 200) {
+          //       } else {
-          this.$message({
+          //         item.sfczr = "0";
-            showClose: true,
+          //       }
-            message: "保存成功！",
+          //     });
-            type: "success",
+          //   }
+          // }
+          save(this.ruleForm).then((res) => {
+            if (res.code === 200) {
+              this.$message({
+                showClose: true,
+                message: "保存成功！",
+                type: "success",
+              });
+              this.$store.dispatch("user/refreshPage", true);
+            } else {
+              this.$message({
+                showClose: true,
+                message: res.message,
+                type: "error",
+              });
+            }
          });
-          this.$store.dispatch("user/refreshPage", true);
        } else {
-          this.$message({
-            showClose: true,
-            message: res.message,
-            type: "error",
-          });
-        }
-      });         } else {
          return false;
        }
      });
    },
  },
 };
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
View file @1814739
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
View file @1814739
@@ -14,6 +14,7 @@
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
+      :show-message="false"
      inline-message
      label-width="145px"
    >
@@ -56,7 +57,7 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="上手业务号：">
-              <el-input v-model="ruleForm.qlxx.ssywh"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -67,8 +68,8 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
-            <el-form-item label="登记类型：">
+            <el-form-item label="登记类型："  prop="qlxx.djlx" :rules="rules.djlxrules">
-              <el-select v-model="ruleForm.qlxx.djlx">
+              <el-select v-model="ruleForm.qlxx.djlx"  @change="djlxchange">
                <el-option
                  v-for="item in djlxlist"
                  :key="item.dcode"
@@ -157,7 +158,7 @@
              <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
            <el-form-item
              label="区县代码："
              prop="qlxx.qxdm"
@@ -165,7 +166,7 @@
            >
              <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
            </el-form-item>
-          </el-col>
+          </el-col> -->
          <el-col :span="8">
            <el-form-item
              label="登记机构："
@@ -224,9 +225,9 @@
        <el-row :gutter="10">
          <el-col :span="12">
            <el-form-item label="共有方式：">
-              <el-radio-group
+            <el-radio-group
-                :disabled="$route.query.viewtype == 0"
+                 :disabled="!ableOperation"
-                v-model="ruleForm.qlxx.gyqk"
+                v-model="ruleForm.qlxx.gyfs"
              >
                <el-radio label="0">单独所有</el-radio>
                <el-radio label="1">共同共有</el-radio>
@@ -235,30 +236,6 @@
              </el-radio-group>
            </el-form-item>
          </el-col>
-          <el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
-            <el-form-item label="是否分别持证：">
-              <el-radio-group v-model="ruleForm.qlxx.sqfbcz">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col
-            :span="6"
-            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'"
-          >
-            <el-form-item label="持证人：">
-              <el-select v-model="ruleForm.czr" placeholder="持证人">
-                <el-option
-                  v-for="item in czrOptions"
-                  :key="item.zjh"
-                  :label="item.sqrmc"
-                  :value="item.zjh"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
        </el-row>
        <qlrCommonTable
          :tableData="ruleForm.qlrData"
@@ -298,6 +275,11 @@ export default {
  },
  data() {
    return {
+         ssqlxxshow:true,
+        props: {
+        label: "bdcqzh",
+        value: "bdcdyid",
+      },
      // 键名转换，方法默认是label和children进行树状渲染
      normalizer(node) {
        //方法
@@ -313,6 +295,7 @@ export default {
      propsParam: this.$attrs,
      ableOperation:false,
      key: 0,
+        ssQlxxList: [],
      // 登记类型
      djlxlist: [
        {
@@ -360,12 +343,13 @@ export default {
      //传递参数\
      rules: {
        bdcqzhrules: [
-          { required: true, message: "不动产权证号：", trigger: "change" },
+          { required: true, message: "不动产权证号：", trigger: "blur" },
        ],
-        qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
+        // qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
-        djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
+        djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
        dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
-        djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
+        djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
+         djlxrules: [{ required: true, message: "登记类型", trigger: "blur" }],
      },
    };
  },
@@ -376,16 +360,29 @@ export default {
     this.ableOperation=this.$parent.ableOperation
  },
  methods: {
+             ssQlxxchange(val) {
+      this.ruleForm.ssQlxx = val;
+      this.ruleForm.qlxx.ssywh = val.ssywh;
+    },
+       djlxchange(val) {
+      console.log("val",val);
+      if (val == null || val == 100) {
+        this.ssqlxxshow = false;
+      } else {
+        this.ssqlxxshow = true;
+      }
+    },
    // 字典
    getDictData(val) {
      return store.getters.dictData[val];
    },
    loadData() {
+        this.$startLoading();
      this.propsParam.isEdit = this.$parent.isEdit;
      init(this.propsParam).then((res) => {
        if (res.code == 200) {
          this.ruleForm = res.result;
+          this.$endLoading();
          if (this.ruleForm.tdytqxList.length > 0) {
            this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
          } else {
@@ -394,6 +391,15 @@ export default {
          this.isShow = true;
        }
      });
+               //获取主体信息
+      getSsQlxx({
+        bdcdyid: this.propsParam.bdcdyid,
+        qllx: this.propsParam.qllx,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.ssQlxxList = res.result;
+        }
+      });
    },
    // 更新土地用途信息
    upDateTdytxxList(val) {
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/tdsyq.vue
View file @1814739
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/tdsyq.vue
View file @1814739
@@ -7,15 +7,15 @@
  <!-- 受理信息 -->
  <div class="slxx">
    <el-form
-      :model="ruleForm"
+   :model="ruleForm"
      :rules="rules"
-         :class="{readonly: editDisabled }"
-       class="loadingtext"
      ref="ruleForm"
+          :class="{readonly: editDisabled }"
+       class="loadingtext"
+       :show-message="false"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
-      inline-message
+      label-width="120px"
-      label-width="145px"
    >
      <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
        <div class="slxx_title title-block">
@@ -43,6 +43,34 @@
          土地所有权信息
          <div class="triangle"></div>
        </div>
+         <el-row :gutter="10" class="ssqlxx">
+          <el-col :span="24" v-if="ssqlxxshow">
+            <el-form-item label="上手权利信息：">
+              <select-table
+                v-model="ruleForm.ssQlxx"
+                :table-width="550"
+                :tableData="ssQlxxList"
+                :props="props"
+                @change="ssQlxxchange"
+              >
+                <el-table-column
+                  prop="qllxmc"
+                  width="130"
+                  label="权利类型"
+                ></el-table-column>
+                <el-table-column
+                  prop="bdcqzh"
+                  width="160"
+                  label="不动产权证书"
+                ></el-table-column>
+                <el-table-column prop="qlrmc" label="权利人"></el-table-column>
+                <el-table-column prop="mjmc" label="面积"></el-table-column>
+                <el-table-column prop="ytmc" label="用途"></el-table-column>
+                <el-table-column prop="zl" label="坐落"></el-table-column>
+              </select-table>
+            </el-form-item>
+          </el-col>
+        </el-row>
        <el-row :gutter="10">
          <el-col :span="8">
            <el-form-item label="不动产单元号：">
@@ -56,7 +84,7 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="上手业务号：">
-              <el-input v-model="ruleForm.qlxx.ssywh"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -67,8 +95,8 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
-            <el-form-item label="登记类型：">
+            <el-form-item label="登记类型："  prop="qlxx.djlx" :rules="rules.djlxrules">
-              <el-select v-model="ruleForm.qlxx.djlx">
+              <el-select v-model="ruleForm.qlxx.djlx" @change="djlxchange">
                <el-option
                  v-for="item in djlxlist"
                  :key="item.dcode"
@@ -97,7 +125,7 @@
              <el-input v-model="ruleForm.qlxx.djjg"></el-input>
            </el-form-item>
          </el-col>
-            <el-col :span="8">
+            <!-- <el-col :span="8">
            <el-form-item
              label="区县代码："
              prop="qlxx.qxdm"
@@ -105,7 +133,7 @@
            >
              <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
            </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="8">
            <el-form-item
              label="不动产权证号："
@@ -262,30 +290,6 @@
              </el-radio-group>
            </el-form-item>
          </el-col>
-          <el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
-            <el-form-item label="是否分别持证：">
-              <el-radio-group v-model="ruleForm.qlxx.sqfbcz">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col
-            :span="6"
-            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'"
-          >
-            <el-form-item label="持证人：">
-              <el-select v-model="ruleForm.czr" placeholder="持证人">
-                <el-option
-                  v-for="item in czrOptions"
-                  :key="item.zjh"
-                  :label="item.sqrmc"
-                  :value="item.zjh"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
        </el-row>
        <qlrCommonTable
          :tableData="ruleForm.qlrData"
@@ -306,11 +310,12 @@
 <script>
 import store from "@/store/index.js";
 import { mapGetters } from "vuex";
-import { init, save } from "@/api/djbRepair.js";
+import { init,getSsQlxx, save } from "@/api/djbRepair.js";
 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
+import selectTable from "@/components/selectTable/index.vue";
 import tdytTable from "@/views/workflow/components/tdytTable";
 export default {
-  components: { qlrCommonTable, tdytTable },
+  components: { qlrCommonTable, tdytTable ,selectTable},
  computed: {
    ...mapGetters(["dictData", "flag"]),
    // 根据流程判断表单是否为只读
@@ -324,6 +329,11 @@ export default {
  },
  data() {
    return {
+      ssqlxxshow:true,
+        props: {
+        label: "bdcqzh",
+        value: "bdcdyid",
+      },
      // 键名转换，方法默认是label和children进行树状渲染
      normalizer(node) {
        //方法
@@ -381,36 +391,58 @@ export default {
      isShow: false,
      disabled: true,
      czrOptions: [],
+       ssQlxxList: [],
      ruleForm: {},
      ableOperation:false,
      //传递参数\
      rules: {
        bdcqzhrules: [
-          { required: true, message: "不动产权证号：", trigger: "change" },
+          { required: true, message: "不动产权证号：", trigger: "blur" },
        ],
-        qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
+        // qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
-        djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
+        djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
        dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
-        djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
+        djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
+        djlxrules: [{ required: true, message: "登记类型", trigger: "blur" }],
      },
    };
  },
  created() {
-    this.loadData();
  },
  mounted() {
+       this.loadData();
     this.ableOperation=this.$parent.ableOperation
  },
  methods: {
+         ssQlxxchange(val) {
+      this.ruleForm.ssQlxx = val;
+      this.ruleForm.qlxx.ssywh = val.ssywh;
+    },
+       djlxchange(val) {
+      console.log("val",val);
+      if (val == null || val == 100) {
+        this.ssqlxxshow = false;
+      } else {
+        this.ssqlxxshow = true;
+      }
+    },
    // 字典
    getDictData(val) {
      return store.getters.dictData[val];
    },
    loadData() {
+      this.$startLoading();
      this.propsParam.isEdit = this.$parent.isEdit;
      init(this.propsParam).then((res) => {
        if (res.code == 200) {
          this.ruleForm = res.result;
+             let djlx = this.ruleForm.qlxx.djlx;
+          if (djlx == null || djlx == 100) {
+            this.ssqlxxshow = false;
+          }
+           this.$endLoading();
          if (this.ruleForm.tdytqxList.length > 0) {
            this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
          } else {
@@ -419,6 +451,15 @@ export default {
          this.isShow = true;
        }
      });
+          //获取主体信息
+      getSsQlxx({
+        bdcdyid: this.propsParam.bdcdyid,
+        qllx: this.propsParam.qllx,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.ssQlxxList = res.result;
+        }
+      });
    },
    // 更新土地用途信息
    upDateTdytxxList(val) {
@@ -431,11 +472,11 @@ export default {
      this.czrOptions = this.ruleForm.qlrData;
      this.key++;
    },
-    // 更新义务人信息
+    // // 更新义务人信息
-    upDateYwrxxList(val) {
+    // upDateYwrxxList(val) {
-      this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
+    //   this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
-      this.key++;
+    //   this.key++;
-    },
+    // },
    onSubmit() {
      this.$refs.ruleForm.validate((valid) => {
        if (valid) {
@@ -502,10 +543,76 @@ export default {
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
-@import "~@/styles/slxx/slxx.scss";
+/deep/.el-form {
-.loadingtext{
+  display: flex;
- /deep/.el-form-item__content{
+  flex-direction: column;
-      pointer-events: none!important;
+  height: calc(100vh - 130px);
-    }
+}
+/deep/.el-form-item__label {
+  padding: 0;
+}
+/deep/.el-radio {
+  margin-right: 10px;
+}
+/deep/.el-select {
+  width: 100%;
+}
+/deep/.el-form-item {
+  margin-bottom: 8px;
+}
+.marginBot0 {
+  margin-bottom: 0 !important;
+}
+.slxx {
+  box-sizing: border-box;
 }
+.slxx_con {
+  flex: 1;
+  height: 100%;
+  background-color: #ffffff;
+  overflow-y: auto;
+  padding-right: 3px;
+  overflow-x: hidden;
+}
+.submit_btn {
+  height: 50px;
+}
+.slxx_title {
+  border-bottom: 1px solid $borderColor;
+  padding-left: 10px;
+  padding-bottom: 5px;
+  margin-bottom: 10px;
+  margin-top: 5px;
+  font-size: 16px;
+  font-weight: 500;
+  color: #4a4a4a;
+}
+.btn {
+  text-align: center;
+  padding-top: 10px;
+  height: 36px;
+  background-color: #ffffff;
+  padding: 5px 0;
+}
+.textArea {
+  /deep/.el-textarea__inner {
+    min-height: 90px !important;
+  }
+}
+/deep/.el-form-item__label {
+  padding-bottom: 0px;
+}
 </style>
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/ygdj.vue
View file @1814739
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/ygdj.vue
View file @1814739
@@ -14,6 +14,7 @@
       class="loadingtext"
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
+      :show-message="false"
      :inline="flag"
      inline-message
      label-width="145px"
@@ -44,6 +45,34 @@
          预告登记信息
          <div class="triangle"></div>
        </div>
+             <el-row :gutter="10" class="ssqlxx">
+          <el-col :span="24" v-if="ssqlxxshow">
+            <el-form-item label="上手权利信息：">
+              <select-table
+                v-model="ruleForm.ssQlxx"
+                :table-width="550"
+                :tableData="ssQlxxList"
+                :props="props"
+                @change="ssQlxxchange"
+              >
+                <el-table-column
+                  prop="qllxmc"
+                  width="130"
+                  label="权利类型"
+                ></el-table-column>
+                <el-table-column
+                  prop="bdcqzh"
+                  width="160"
+                  label="不动产权证书"
+                ></el-table-column>
+                <el-table-column prop="qlrmc" label="权利人"></el-table-column>
+                <el-table-column prop="mjmc" label="面积"></el-table-column>
+                <el-table-column prop="ytmc" label="用途"></el-table-column>
+                <el-table-column prop="zl" label="坐落"></el-table-column>
+              </select-table>
+            </el-form-item>
+          </el-col>
+        </el-row>
        <el-row :gutter="10">
          <el-col :span="8">
            <el-form-item label="不动产单元号：">
@@ -57,7 +86,7 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="上手业务号：">
-              <el-input v-model="ruleForm.qlxx.ssywh"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -73,8 +102,8 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
-            <el-form-item label="登记类型：">
+            <el-form-item label="登记类型："  prop="qlxx.djlx" :rules="rules.djlxrules">
-              <el-select v-model="ruleForm.qlxx.djlx">
+              <el-select v-model="ruleForm.qlxx.djlx" @change="djlxchange">
                <el-option
                  v-for="item in djlxlist"
                  :key="item.dcode"
@@ -95,11 +124,11 @@
              <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
            <el-form-item label="区县代码：" prop="qlxx.qxdm" :rules="rules.qxdmrules">
              <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
            </el-form-item>
-          </el-col>
+          </el-col> -->
          <el-col :span="8">
            <el-form-item label="登记机构：" prop="qlxx.djjg" :rules="rules.djjgrules">
              <el-input v-model="ruleForm.qlxx.djjg"></el-input>
@@ -271,7 +300,10 @@
        <el-row :gutter="10">
          <el-col :span="12">
            <el-form-item label="共有方式：">
-              <el-radio-group v-model="ruleForm.qlxx.gyqk">
+             <el-radio-group
+                 :disabled="!ableOperation"
+                v-model="ruleForm.qlxx.gyfs"
+              >
                <el-radio label="0">单独所有</el-radio>
                <el-radio label="1">共同共有</el-radio>
                <el-radio label="2">按份所有</el-radio>
@@ -312,12 +344,13 @@
 </template>
 <script>
 import { mapGetters } from "vuex";
-import { init, save } from "@/api/djbRepair.js";
+import { init,getSsQlxx, save } from "@/api/djbRepair.js";
 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
 import tdytTable from "@/views/workflow/components/tdytTable";
+import selectTable from "@/components/selectTable/index.vue";
 export default {
-  components: { qlrCommonTable, ywrCommonTable, tdytTable },
+  components: { qlrCommonTable, ywrCommonTable, tdytTable,selectTable  },
  computed: {
    ...mapGetters(["dictData", "flag"]),
    // 根据流程判断表单是否为只读
@@ -331,12 +364,18 @@ export default {
  },
  data() {
    return {
+         ssqlxxshow:true,
+        props: {
+        label: "bdcqzh",
+        value: "bdcdyid",
+      },
      //表单是否可操作
      propsParam: this.$attrs,
      key: 0,
      isShow: false,
      disabled: true,
      czrOptions: [],
+       ssQlxxList: [],
      ruleForm: {},
       // 登记类型
      djlxlist: [
@@ -380,13 +419,14 @@ export default {
      //传递参数\
         rules: {
          bdcqzhrules:[
-            { required: true, message: "不动产权证号：", trigger: "change" },
+            { required: true, message: "不动产权证号：", trigger: "blur" },
          ],
-        qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
+        // qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
-        djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
+        djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
        dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
-        djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
+        djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
-        ygdjlxrules: [{ required: true, message: "预告登记种类", trigger: "change" }],
+        ygdjlxrules: [{ required: true, message: "预告登记种类", trigger: "blur" }],
+         djlxrules: [{ required: true, message: "登记类型", trigger: "blur" }],
      },
      ableOperation:false,
    };
@@ -398,14 +438,41 @@ export default {
      this.ableOperation=this.$parent.ableOperation
  },
  methods: {
+              ssQlxxchange(val) {
+      this.ruleForm.ssQlxx = val;
+      this.ruleForm.qlxx.ssywh = val.ssywh;
+    },
+       djlxchange(val) {
+      console.log("val",val);
+      if (val == null || val == 100) {
+        this.ssqlxxshow = false;
+      } else {
+        this.ssqlxxshow = true;
+      }
+    },
    loadData() {
+       this.$startLoading();
      this.propsParam.isEdit=this.$parent.isEdit
      init(this.propsParam).then((res) => {
        if (res.code == 200) {
          this.ruleForm = res.result;
+           let djlx = this.ruleForm.qlxx.djlx;
+          if (djlx == null || djlx == 100) {
+            this.ssqlxxshow = false;
+          }
+           this.$endLoading();
          this.isShow = true;
        }
      });
+        //获取主体信息
+      getSsQlxx({
+        bdcdyid: this.propsParam.bdcdyid,
+        qllx: this.propsParam.qllx,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.ssQlxxList = res.result;
+        }
+      });
    },
    // 更新土地用途信息
    upDateTdytxxList(val) {
@@ -434,7 +501,14 @@ export default {
        });
        return false;
      }
+       if (this.ruleForm.ywrData.length == 0) {
+            this.$message({
+              showClose: true,
+              message: "请确认义务人信息",
+              type: "error",
+            });
+            return false;
+          }
      if (this.ruleForm.qlxx.gyfs == "0") {
        if (this.ruleForm.qlrData.length > 1) {
          this.$message({
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/yydj.vue
View file @1814739
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/yydj.vue
View file @1814739
@@ -15,6 +15,7 @@
      :label-position="flag ? 'top' : ''"
      :inline="flag"
      inline-message
+      :show-message="false"
      label-width="145px"
    >
      <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
@@ -56,7 +57,7 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="上手业务号：">
-              <el-input v-model="ruleForm.qlxx.ssywh"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -94,11 +95,11 @@
              <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
            <el-form-item label="区县代码："  prop="qlxx.qxdm" :rules="rules.qxdmrules">
              <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
            </el-form-item>
-          </el-col>
+          </el-col> -->
          <el-col :span="8">
            <el-form-item label="登记机构：" prop="qlxx.djjg" :rules="rules.djjgrules">
              <el-input v-model="ruleForm.qlxx.djjg"></el-input>
@@ -190,7 +191,10 @@
        <el-row :gutter="10">
          <el-col :span="12">
            <el-form-item label="共有方式：">
-              <el-radio-group v-model="ruleForm.qlxx.gyqk">
+              <el-radio-group
+                 :disabled="!ableOperation"
+                v-model="ruleForm.qlxx.gyfs"
+              >
                <el-radio label="0">单独所有</el-radio>
                <el-radio label="1">共同共有</el-radio>
                <el-radio label="2">按份所有</el-radio>
@@ -300,7 +304,7 @@ export default {
          bdcqzhrules:[
            { required: true, message: "不动产权证号：", trigger: "change" },
          ],
-        qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
+        // qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
        djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
        dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
        djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
@@ -316,10 +320,12 @@ export default {
  },
  methods: {
    loadData() {
+       this.$startLoading();
      this.propsParam.isEdit=this.$parent.isEdit
      init(this.propsParam).then((res) => {
        if (res.code == 200) {
          this.ruleForm = res.result;
+            this.$endLoading();
          this.isShow = true;
        }
      });
@@ -351,7 +357,14 @@ export default {
        });
        return false;
      }
+      if (this.ruleForm.ywrData.length == 0) {
+            this.$message({
+              showClose: true,
+              message: "请确认义务人信息",
+              type: "error",
+            });
+            return false;
+          }
      if (this.ruleForm.qlxx.gyfs == "0") {
        if (this.ruleForm.qlrData.length > 1) {
          this.$message({
--- a/src/views/djbworkflow/djbBook/spyj.vue
View file @1814739
+++ b/src/views/djbworkflow/djbBook/spyj.vue
View file @1814739
@@ -7,70 +7,58 @@
  <div class="spyj loadingtext">
    <div class="box">
      <div class="spyj_title">
-        <div class="leftadd" v-if="ableOperation">
+        <div class="righttitle">审批表</div>
-                <i
-                  class="el-icon-plus pointer"
-                   @click="addClick()"
-                ></i>
-              </div>
-            <div class="righttitle">审批表</div>
      </div>
      <div v-for="(item, index) in tableData" :key="index">
        <el-form
          :model="tableData[index]"
          label-width="120px"
-          :rules="rules"
+          ref="ruleFormRef'"
-          :ref="'ruleFormRef' + index"
        >
          <div class="spyj_form">
            <div class="item_left">
-              <div class="left" v-if="ableOperation">
-                <i
-                  class="el-icon-minus pointer"
-                  @click="deleClick()"
-                ></i>
-              </div>
-              <div class="left" v-else>
-                 {{index+1}}
-              </div>
              <div class="right">{{ item.jdmc }}意见</div>
            </div>
            <div class="item_right">
              <el-row>
                <el-col :span="24">
-                  <el-form-item
+                  <el-form-item label-width="0" class="opinion_item">
-                    label-width="0"
-                    class="opinion_item"
-                    prop="shyj"
-                  >
                    <el-input
-                     :disabled="!ableOperation"
+                      :disabled="!ableOperation"
                      type="textarea"
                      :rows="4"
                      class="opinion"
                      placeholder="请输入审批意见"
                      v-model="item.shyj"
                    ></el-input>
-                     <el-button class="opinion_btn" @click="commonOpinion(index)" v-if="ableOperation">常用意见</el-button>
+                    <el-button
+                      class="opinion_btn"
+                      @click="commonOpinion(index)"
+                      v-if="ableOperation"
+                      >常用意见</el-button
+                    >
                  </el-form-item>
                </el-col>
              </el-row>
              <el-row>
                <el-col :span="16">
-                  <el-form-item label="审查人" prop="shryxm">
+                  <el-form-item label="审查人">
-                    <el-input  :disabled="!ableOperation" v-model="item.shryxm"></el-input>
+                    <el-input
+                      :disabled="!ableOperation || !item.shyj"
+                      v-model="item.shryxm"
+                    ></el-input>
                  </el-form-item>
                </el-col>
                <el-col :span="8">
-                  <el-form-item class="sjxzq" label="审核时间" prop="shkssj">
+                  <el-form-item class="sjxzq" label="审核时间">
                    <el-date-picker
-                     :disabled="!ableOperation"
+                      :disabled="!ableOperation || !item.shyj"
                      v-model="item.shkssj"
                      type="date"
-                     placeholder="选择日期"
+                      placeholder="选择日期"
-              value-format="yyyy-MM-dd HH:mm:ss"
+                      value-format="yyyy-MM-dd HH:mm:ss"
-              format="yyyy-MM-dd"
+                      format="yyyy-MM-dd"
                    >
                    </el-date-picker>
                  </el-form-item>
@@ -81,9 +69,7 @@
        </el-form>
      </div>
      <div class="submit_button" v-if="ableOperation">
-        <el-button type="primary" @click="onSubmit('ruleFormRef')"
+        <el-button type="primary" @click="onSubmit()">保存</el-button>
-          >保存</el-button
-        >
      </div>
    </div>
    <!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> -->
@@ -99,54 +85,30 @@ export default {
  data() {
    return {
      isNoData: false,
-      currentindex:0,
+      currentindex: 0,
      ableOperation: false,
-      tableData: [{ jdmc: "初审" }],
+      tableData: [{ jdmc: "初审" }, { jdmc: "复审" }, { jdmc: "核定" }],
-      rules: {
+      falg: false,
-        shyj: [{ required: true, message: "请填写意见", trigger: "blur" }],
+      falg1: false,
-        shryxm: [{ required: true, message: "审查人", trigger: "blur" }],
-        shkssj: [{ required: true, message: "审核时间", trigger: "blur" }],
-      },
    };
  },
-   watch: {
+  watch: {
-      yjsqOptions: {
+    yjsqOptions: {
-        handler (val) {
+      handler(val) {
-          this.add(val)
+        console.log("val", val);
-        },
+        this.add(val);
-        deep: true,
-        immediate: true
      },
+      deep: true,
+      immediate: true,
    },
+  },
  created() {},
  mounted() {
-  this.ableOperation=this.$parent.ableOperation
+    this.ableOperation = this.$parent.ableOperation;
    this.getShList();
  },
  methods: {
-    deleClick(){
-      if(this.tableData.length<=1){
-        this.$message.error("最少填写一条初审意见");
-      }else if(this.tableData.length>=2){
-        this.tableData=this.tableData.slice(0,-1)
-      }
-    },
-    addClick(){
-       if(this.tableData.length==1){
-        this.tableData.push({ jdmc: "复审" })
-      }else if(this.tableData.length==2){
-         this.tableData.push({ jdmc: "核定" })
-      }else{
-         this.$message.error("只允许添加三条意见");
-      }
-   },
    getShList() {
      this.$startLoading();
      var formdata = {
@@ -163,16 +125,53 @@ export default {
        }
      });
    },
-    onSubmit(formName) {
+    judgment(obj) {},
-      const falg = [];
+    onSubmit() {
-      for (let index = 0; index < this.tableData.length; index++) {
+      if (
-        this.$refs[formName + index][0].validate((valid) => {
+        this.tableData[2].shyj == null ||
-          if (valid) {
+        this.tableData[2].shryxm == null ||
-            falg.push(1);
+        this.tableData[2].shkssj == null ||
+        this.tableData[2].shyj == "" ||
+        this.tableData[2].shryxm == "" ||
+        this.tableData[2].shkssj == ""
+      ) {
+        this.falg = false;
+        this.$message.error("请完善核定意见信息填写");
+      } else {
+        this.falg = true;
+        if (this.tableData[0].shyj != null && this.tableData[0].shyj != "") {
+          if (
+            this.tableData[0].shryxm == null ||
+            this.tableData[0].shryxm == "" ||
+            this.tableData[0].shkssj == null ||
+            this.tableData[0].shkssj == ""
+          ) {
+            this.$message.error("请完善初审意见信息填写");
+            this.falg = false;
+          } else {
+            this.falg = true;
          }
-        });
+        } else {
+          this.falg = true;
+        }
+        if (this.tableData[1].shyj != null && this.tableData[1].shyj != "") {
+          if (
+            this.tableData[1].shryxm == null ||
+            this.tableData[1].shryxm == "" ||
+            this.tableData[1].shkssj == null ||
+            this.tableData[1].shkssj == ""
+          ) {
+            this.$message.error("请完善复审意见信息填写");
+            this.falg1 = false;
+          } else {
+            this.falg1 = true;
+          }
+        } else {
+          this.falg1 = true;
+        }
      }
-      if (falg.length == this.tableData.length) {
+      if (this.falg && this.falg1) {
        this.tableData.forEach((item, index) => {
          item["bsmBusiness"] = this.$parent.bsmRepair;
        }),
@@ -188,15 +187,22 @@ export default {
        return false;
      }
    },
-      //打开常用意见列表弹窗
+    //打开常用意见列表弹窗
-      commonOpinion (index) {
+    commonOpinion(index) {
-        this.currentindex=index
+      this.currentindex = index;
-        this.$popupDialog("常用意见", "workflow/components/dialog/commonOpinion", {}, "70%", true)
+      this.$popupDialog(
-      },
+        "常用意见",
-      add(val){
+        "workflow/components/dialog/commonOpinion",
-        this.$set(this.tableData[this.currentindex],'shyj',val)
+        {},
+        "70%",
+        true
+      );
+    },
+    add(val) {
+      if (val != "") {
+        this.$set(this.tableData[this.currentindex], "shyj", val);
      }
+    },
  },
 };
 </script>
@@ -218,37 +224,33 @@ export default {
    overflow-y: scroll;
    padding-top: 20px;
    padding: 20px 40px;
-     .spyj_title {
+    .spyj_title {
-    width: 100%;
+      width: 100%;
-    height:80px;
+      height: 80px;
-    border: 1px solid $borderColor;
+      border: 1px solid $borderColor;
-    background-color: #eceef2;
+      background-color: #eceef2;
-    display: flex;
+      display: flex;
+    }
-     }
+    .leftadd {
-    .leftadd{
+      width: 3%;
-        width: 3%;
+      height: 100%;
-        height: 100%;
+      display: flex;
-           display: flex;
+      font-size: 14px;
-        font-size: 14px;
+      text-indent: 20px;
-        text-indent: 20px;
+      align-items: center;
-        align-items: center;
+      border: 1px solid $borderColor;
-         border: 1px solid $borderColor;
+    }
+    .righttitle {
+      width: 80%;
+      height: 100%;
+      line-height: 80px;
+      border: 1px solid $borderColor;
+      text-align: center;
+      font-size: 22px;
+      font-weight: 400;
    }
-     .righttitle{
-          width: 80%;
-          height: 100%;
-          line-height: 80px;
-         border: 1px solid $borderColor;
-         text-align: center;
-         font-size: 22px;
-         font-weight: 400;
-        }
  }
  /deep/.el-form-item {
    margin-bottom: 0;
  }
@@ -267,33 +269,9 @@ export default {
      color: #606266;
      display: flex;
      font-size: 14px;
-      text-indent: 80px;
+      text-indent: 50px;
      align-items: center;
      border-right: 1px solid $borderColor;
-      .left {
-        width: 30%;
-        height: 100%;
-           display: flex;
-        font-size: 14px;
-        text-indent: 20px;
-        align-items: center;
-        border-right: 1px solid $borderColor;
-        .el-icon-minus{
-        font-size: 14px;
-        color: black;
-        }
-      }
-      .right {
-        width: 70%;
-        height: 100%;
-        color: #606266;
-        display: flex;
-        font-size: 14px;
-        text-indent: 20px;
-        align-items: center;
-        border-right: 1px solid $borderColor;
-      }
    }
    .item_right {
@@ -338,10 +316,8 @@ export default {
    margin: 15px 0;
  }
-  .el-date-editor.el-input{
+  .el-date-editor.el-input {
-  width: 100%;
+    width: 100%;
  }
 }
 </style>
--- a/src/views/djbworkflow/flowform.js
View file @1814739
+++ b/src/views/djbworkflow/flowform.js
View file @1814739
@@ -16,6 +16,9 @@ export function getForm(tabName) {
    case "jsydsyq":
      form = require("@/views/registerBook/jsydsyq.vue");
      break;
+      case "tdsyq":
+        form = require("@/views/registerBook/tdsyq.vue");
+        break;
    case "nydsyq":
      form = require("@/views/registerBook/nydsyq.vue");
      break;
--- a/src/views/djbworkflow/mixin/index.js
View file @1814739
+++ b/src/views/djbworkflow/mixin/index.js
View file @1814739
@@ -98,8 +98,22 @@ export default {
          })
          break;
        case "B2": //材料分屏按钮
+        this.splitScreen = this.splitScreen ? false : true;
+        this.$store.dispatch("app/settScreen", this.splitScreen);
+        if (this.splitScreen) {
-          this.closefp()
+          //如果当前选项卡为材料信息内容，递减到上一个选项卡内容
+          if (this.tabName == this.clxxTab.value) {
+            this.tabName = this.tabList[this.clxxIndex - 1].value;
+            this.getFromRouter(this.tabList[this.clxxIndex - 1].value);
+          }
+          //删除材料信息选项卡数据
+          this.tabList.splice(this.clxxIndex, 1);
+        } else {
+          //新增材料信息选项卡数据
+          this.tabList.splice(this.clxxIndex, 0, this.clxxTab);
+        }
+          // this.closefp()
          // if (this.splitScreen) {
          //   //如果当前选项卡为材料信息内容，递减到上一个选项卡内容
--- a/src/views/djbworkflow/workFrame.vue
View file @1814739
+++ b/src/views/djbworkflow/workFrame.vue
View file @1814739
@@ -117,6 +117,11 @@
        tabdata: [],
        bsmRepair:"",
        defaultNode: {},
+          clxxForm: "",
+        //材料信息选择卡索引
+        clxxIndex: "",
+        //材料信息选项卡对象
+        clxxTab: {},
        ableOperation:false
      };
    },
@@ -134,7 +139,25 @@
              this.tabName = this.tabList[0].value;
                this.ableOperation=this.tabList[0].ableOperation
              this.getFromRouter(this.tabName);
+               if(this.tabList.length!=8){
+                   let that = this;
+                   this.tabList.forEach(function (item, index) {
+                if (item.value == "clxx") {
+                  that.clxxIndex = index;
+                  that.clxxForm = getForm(item.value, that.$route.query.sqywbm);
+                  that.clxxTab = item;
+                }
+              })
+               }
            });
          });
        }
      },
@@ -193,12 +216,13 @@
      getFromRouter (tabname) {
        this.componentTag = getForm(tabname);
      },
-      closefp () {
+      // closefp () {
-        this.splitScreen = this.splitScreen ? false : true;
+      //   this.splitScreen = this.splitScreen ? false : true;
-        this.$store.dispatch("app/set1tScreen", this.splitScreen);
+      //   this.$store.dispatch("app/set1tScreen", this.splitScreen);
-        this.getFromRouter(this.tabList[0].value);
+      //   this.getFromRouter(this.tabList[0].value);
-        this.clxxForm = getForm(this.tabList[1].value);
+      //   this.clxxForm = getForm(this.tabList[1].value);
-      },
+      //   this.tabName = this.tabList[0].value
+      // },
      // 增加补录记录
      addRepairRecord (row, del) {
        let from = {
@@ -239,18 +263,18 @@
            console.log("错", res);
          })
      },
-      openDialog () {
+      // openDialog () {
-        this.$store.dispatch('user/refreshPage', false)
+      //   this.$store.dispatch('user/refreshPage', false)
-        let data = JSON.parse(localStorage.getItem('ywbl'))
+      //   let data = JSON.parse(localStorage.getItem('ywbl'))
-        let title
+      //   let title
-        if (data?.sqywmc) {
+      //   if (data?.sqywmc) {
-          title = "申请业务：" + data?.sqywmc
+      //     title = "申请业务：" + data?.sqywmc
-        } else {
+      //   } else {
-          title = "申请业务：" + data?.djywmc
+      //     title = "申请业务：" + data?.djywmc
-        }
+      //   }
-        this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'djywbm': this.$route.query.sqywbm, 'isJump': true, 'sqywInfo': data }, "80%", true)
+      //   this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'djywbm': this.$route.query.sqywbm, 'isJump': true, 'sqywInfo': data }, "80%", true)
-      }
+      // }
    }
  };
 </script>
--- a/src/views/jkfw/ptjk/components/addDialog.vue
View file @1814739
+++ b/src/views/jkfw/ptjk/components/addDialog.vue
View file @1814739
+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-19 09:50:23
+-->
 <template>
  <dialogBox :title="editFlag ? '编辑接口信息' : '新增接口信息'" @submitForm="submitForm" saveButton="保存" width="50%" :isFullscreen="false"
    @closeDialog="closeDialog" v-model="value">
@@ -26,7 +31,7 @@
          <el-col :span="12">
            <el-form-item label="接口方式:" prop="interfaceMethod">
              <el-select v-model="ruleForm.interfaceMethod" class="width100" placeholder="请选择">
-                <el-option v-for="item in interfaceMethods" :key="item" :label="item" :value="item" ></el-option>
+                <el-option v-for="item in interfaceMethods" :key="item" :label="item" :value="item"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@@ -58,115 +63,115 @@
 </template>
 <script>
-import { addSysInterface, editSysInterface} from "@/api/ptjk.js"
+  import { addSysInterface, editSysInterface } from "@/api/ptjk.js"
-export default {
+  export default {
-  components: {
+    components: {
-  },
+    },
-  computed: {
+    computed: {
-  },
+    },
-  props: {
+    props: {
-    value: { type: Boolean, default: false },
+      value: { type: Boolean, default: false },
-    editFlag: {type: Boolean,default:false}
+      editFlag: { type: Boolean, default: false }
-  },
+    },
-  data () {
+    data () {
-    return {
+      return {
-      //表单提交数据
+        //表单提交数据
-      interfaceMethods: ['webapi','webservice'],
+        interfaceMethods: ['webapi', 'webservice'],
-      interfaceTypes: [
+        interfaceTypes: [
-          {'label': '工作流服务平台','value':'1'},
+          { 'label': '工作流服务平台', 'value': '1' },
-          {'label': '权限平台','value':'2'},
+          { 'label': '权限平台', 'value': '2' },
-          {'label': '定时器服务','value':'3'},
+          { 'label': '定时器服务', 'value': '3' },
-          {'label': '其他第三方平台','value':'4'},
+          { 'label': '其他第三方平台', 'value': '4' },
-      ],
-      ruleForm: {
-        interfaceCode: '',
-        interfaceService: '',
-        interfaceDescription: '',
-        interfaceApi: '',
-        interfaceMethod: '',
-        interfaceType: '',
-        interfaceKey: '',
-      },
-      rules: {
-        interfaceCode: [
-          { required: true, message: '接口代码不能为空', trigger: 'blur' }
-        ],
-        interfaceService: [
-          { required: true, message: '接口服务名称不能为空', trigger: 'blur' }
-        ],
-        interfaceApi: [
-          { required: true, message: '接口api地址不能为空', trigger: 'blur' }
-        ],
-        interfaceMethod: [
-          { required: true, message: '接口方式不能为空', trigger: 'change' }
-        ],
-        interfaceType: [
-          { required: true, message: '入库编号不能为空', trigger: 'change' }
        ],
-      },
+        ruleForm: {
-    }
+          interfaceCode: '',
-  },
+          interfaceService: '',
-  methods: {
+          interfaceDescription: '',
-    //表单提交
+          interfaceApi: '',
-    submitForm () {
+          interfaceMethod: '',
-      let that = this;
+          interfaceType: '',
-      that.$refs.ruleForm.validate(valid => {
+          interfaceKey: '',
-        if (valid) {
+        },
-            if(this.editFlag){
+        rules: {
-                this.editInterface();
+          interfaceCode: [
-            }else{
+            { required: true, message: '接口代码不能为空', trigger: 'blur' }
-                this.addInterface();
+          ],
-            }
+          interfaceService: [
-        } else {
+            { required: true, message: '接口服务名称不能为空', trigger: 'blur' }
-          // console.log('error submit!!');
+          ],
-          return false;
+          interfaceApi: [
-        }
+            { required: true, message: '接口api地址不能为空', trigger: 'blur' }
-      });
+          ],
+          interfaceMethod: [
+            { required: true, message: '接口方式不能为空', trigger: 'change' }
+          ],
+          interfaceType: [
+            { required: true, message: '入库编号不能为空', trigger: 'change' }
+          ],
+        },
+      }
    },
-    //新增接口
+    methods: {
-    addInterface(){
+      //表单提交
-        addSysInterface(this.ruleForm).then(res => {
+      submitForm () {
-            if(res.code == 200){
+        let that = this;
-                this.$message.success("保存成功");
+        that.$refs.ruleForm.validate(valid => {
-                this.closeDialog();
+          if (valid) {
-                this.$parent.queryClick();
+            if (this.editFlag) {
-            }else{
+              this.editInterface();
-                this.$message.error(res.message)
+            } else {
+              this.addInterface();
            }
+          } else {
+            // console.log('error submit!!');
+            return false;
+          }
+        });
+      },
+      //新增接口
+      addInterface () {
+        addSysInterface(this.ruleForm).then(res => {
+          if (res.code == 200) {
+            this.$message.success("保存成功");
+            this.closeDialog();
+            this.$parent.queryClick();
+          } else {
+            this.$message.error(res.message)
+          }
        })
-    },
+      },
-    //编辑接口
+      //编辑接口
-    editInterface(){
+      editInterface () {
        editSysInterface(this.ruleForm).then(res => {
-            if(res.code == 200){
+          if (res.code == 200) {
-                this.$message.success("编辑成功");
+            this.$message.success("编辑成功");
-                this.closeDialog();
+            this.closeDialog();
-                this.$parent.queryClick();
+            this.$parent.queryClick();
-            }else{
+          } else {
-                this.$message.error(res.message)
+            this.$message.error(res.message)
-            }
+          }
        })
-    },
+      },
-    //获取详情
+      //获取详情
-    getDetailInfo(item){
+      getDetailInfo (item) {
-      this.ruleForm = item
+        this.ruleForm = item
-    },
+      },
-    //关闭弹窗
+      //关闭弹窗
-    closeDialog () {
+      closeDialog () {
-      this.$emit("input", false);
+        this.$emit("input", false);
-      this.ruleForm = {
+        this.ruleForm = {
-        interfaceCode: '',
+          interfaceCode: '',
-        interfaceService: '',
+          interfaceService: '',
-        interfaceDescription: '',
+          interfaceDescription: '',
-        interfaceApi: '',
+          interfaceApi: '',
-        interfaceMethod: '',
+          interfaceMethod: '',
-        interfaceType: '',
+          interfaceType: '',
-        interfaceKey: '',
+          interfaceKey: '',
+        }
      }
    }
  }
-}
 </script>
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
+  @import "~@/styles/mixin.scss";
 </style>
--- a/src/views/jkfw/ptjk/ptjk.vue
View file @1814739
+++ b/src/views/jkfw/ptjk/ptjk.vue
View file @1814739
+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-19 09:50:36
+-->
 <template>
  <div class="from-clues">
    <!-- 表单部分 -->
@@ -37,72 +42,72 @@
  </div>
 </template>
 <script>
-import { mapGetters } from 'vuex'
+  import { mapGetters } from 'vuex'
-import table from "@/utils/mixin/table"
+  import table from "@/utils/mixin/table"
-import { datas, sendThis } from "./ptjkdata"
+  import { datas, sendThis } from "./ptjkdata"
-import { getSysInterfaceList } from '@/api/ptjk.js'
+  import { getSysInterfaceList } from '@/api/ptjk.js'
-import addDialog from "./components/addDialog.vue"
+  import addDialog from "./components/addDialog.vue"
-import retrieveDialog from "./components/retrieveDialog.vue"
+  import retrieveDialog from "./components/retrieveDialog.vue"
-export default {
+  export default {
-  name: "ptjk",
+    name: "ptjk",
-  components: { addDialog, retrieveDialog },
+    components: { addDialog, retrieveDialog },
-  mixins: [table],
+    mixins: [table],
-  mounted () {
+    mounted () {
-    sendThis(this);
+      sendThis(this);
-    this.queryClick()
+      this.queryClick()
-  },
-  computed: {
-    ...mapGetters(['dictData'])
-  },
-  data () {
-    return {
-      addDialog: false,
-      retrieveDialog: false,
-      editFlag: false,
-      queryForm: {
-        ywly: "",
-        qllx: "",
-        djlx: "",
-        ywh: "",
-      },
-      tableData: {
-        total: 0,
-        columns: datas.columns(),
-        data: [],
-      },
-    };
-  },
-  methods: {
-    queryClick () {
-      this.$startLoading()
-      getSysInterfaceList({ ...this.ruleForm, ...this.pageData }, { 'target': '#ptjkLoading' }).then(res => {
-        this.$endLoading()
-        if (res.code == 200) {
-          let { total, records } = res.result
-          this.tableData.total = total;
-          this.tableData.data = records ? records : []
-        }
-      })
    },
-    //打开新增
+    computed: {
-    openDialog () {
+      ...mapGetters(['dictData'])
-      this.editFlag = false;
-      this.addDialog = true;
    },
-    //打开编辑
+    data () {
-    editInterface (item) {
+      return {
-      this.editFlag = true;
+        addDialog: false,
-      this.addDialog = true;
+        retrieveDialog: false,
-      this.$refs.addDialog.getDetailInfo(item);
+        editFlag: false,
+        queryForm: {
+          ywly: "",
+          qllx: "",
+          djlx: "",
+          ywh: "",
+        },
+        tableData: {
+          total: 0,
+          columns: datas.columns(),
+          data: [],
+        },
+      };
    },
-    //打开调试窗口
+    methods: {
-    tuneInterface (item) {
+      queryClick () {
-      this.retrieveDialog = true;
+        this.$startLoading()
-      this.$refs.retrieveDialog.getDetailInfo(item);
+        getSysInterfaceList({ ...this.ruleForm, ...this.pageData }, { 'target': '#ptjkLoading' }).then(res => {
+          this.$endLoading()
+          if (res.code == 200) {
+            let { total, records } = res.result
+            this.tableData.total = total;
+            this.tableData.data = records ? records : []
+          }
+        })
+      },
+      //打开新增
+      openDialog () {
+        this.editFlag = false;
+        this.addDialog = true;
+      },
+      //打开编辑
+      editInterface (item) {
+        this.editFlag = true;
+        this.addDialog = true;
+        this.$refs.addDialog.getDetailInfo(item);
+      },
+      //打开调试窗口
+      tuneInterface (item) {
+        this.retrieveDialog = true;
+        this.$refs.retrieveDialog.getDetailInfo(item);
+      }
    }
-  }
+  };
-};
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+  @import "~@/styles/public.scss";
 </style>
--- a/src/views/login/index.vue
View file @1814739
+++ b/src/views/login/index.vue
View file @1814739
+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-19 09:50:45
+-->
 <template>
  <div id="login">
    <div class="login-content-wrap">
@@ -16,14 +21,12 @@
              placeholder="请输入账号"
              v-model="userInfo.username"
              @focus="reduceBorder('user')"
-              @blur="addBorder('user')"
+              @blur="addBorder('user')" />
-            />
            <span class="warning" v-show="warning.user">账号不能为空</span>
          </div>
          <div
            class="login-user user-mt"
-            :class="{ 'select-border': change.pass }"
+            :class="{ 'select-border': change.pass }">
-          >
            <img class="user-icon" src="./images/password.svg" />
            <input
              type="password"
@@ -32,8 +35,7 @@
              v-model="userInfo.password"
              v-show="!selectEye"
              @focus="reduceBorder('pass')"
-              @blur="addBorder('pass')"
+              @blur="addBorder('pass')" />
-            />
            <input
              type="text"
              class="user-input"
@@ -41,26 +43,22 @@
              v-model="userInfo.password"
              v-show="selectEye"
              @focus="reduceBorder('pass')"
-              @blur="addBorder('pass')"
+              @blur="addBorder('pass')" />
-            />
            <img
              class="password-eye"
              src="./images/open.svg"
              @click="selectEyes"
-              v-show="selectEye"
+              v-show="selectEye" />
-            />
            <img
              class="password-eye"
              src="./images/close.svg"
              @click="selectEyes"
-              v-show="!selectEye"
+              v-show="!selectEye" />
-            />
            <span class="warning" v-show="warning.pass">密码不能为空</span>
          </div>
          <div
            class="login-user login-valid"
-            :class="{ 'select-border': change.valid }"
+            :class="{ 'select-border': change.valid }">
-          >
            <img class="user-icon" src="./images/valid.svg" />
            <input
              type="text"
@@ -68,14 +66,12 @@
              placeholder="请输入验证码"
              v-model="userInfo.captchaCode"
              @focus="reduceBorder('valid')"
-              @blur="addBorder('valid')"
+              @blur="addBorder('valid')" />
-            />
            <img
              class="valid-img"
              :src="codeSrc"
              alt="暂无验证码"
-              @click="reloadCaptcha"
+              @click="reloadCaptcha" />
-            />
            <span class="warning" v-show="warning.valid">验证码不能为空</span>
          </div>
          <div id="loginBtn" class="login-btn" @click="goHome">登录</div>
@@ -85,302 +81,302 @@
  </div>
 </template>
 <script>
-import axios from "axios";
+  import axios from "axios";
-export default {
+  export default {
-  data() {
+    data () {
-    return {
+      return {
-      // 用户名
-      selectIcon: true,
-      // 用户名
-      selectEye: false,
-      userInfo: {
        // 用户名
-        username: "",
+        selectIcon: true,
-        // 密码
+        // 用户名
-        password: "",
+        selectEye: false,
-        // 重定向地址
+        userInfo: {
-        redirectUrl: "",
+          // 用户名
-        // 验证码key
+          username: "",
-        captchaKey: "",
+          // 密码
-        // 验证码值
+          password: "",
-        captchaCode: "",
+          // 重定向地址
-      },
+          redirectUrl: "",
-      //边框
+          // 验证码key
-      change: {
+          captchaKey: "",
-        user: false,
+          // 验证码值
-        pass: false,
+          captchaCode: "",
-        valid:false
+        },
-      },
+        //边框
-      // 提示语
+        change: {
-      warning: {
+          user: false,
-        user: false,
+          pass: false,
-        pass: false,
+          valid: false
-        valid: false,
+        },
-      },
+        // 提示语
-      // 验证码图片地址
+        warning: {
-      codeSrc:""
+          user: false,
-    };
+          pass: false,
-  },
+          valid: false,
-  mounted() {
+        },
-    this.initPage();
+        // 验证码图片地址
-    this.userInfo.redirectUrl = localStorage.getItem("dj-location");
+        codeSrc: ""
-    this.reloadCaptcha()
+      };
-    let self = this;
-    document.onkeydown = function (e) {
-      //按下回车提交
-      let key = window.event.keyCode;
-      //事件中keycode=13为回车事件
-      if (key == 13) {
-        self.goHome();
-      }
-    };
-  },
-  methods: {
-    // 更新验证码
-    reloadCaptcha(){
-      axios.get(window._config.services.management + "/management/captcha?format=json").then(res => {
-        if (res.data.status === 1) {
-          this.userInfo.captchaKey = res.data.content['dubhe.captcha']
-          this.codeSrc = res.data.content.image
-        }
-      })
    },
-    // 初始化
+    mounted () {
-    initPage() {
+      this.initPage();
-      let userInfo =
+      this.userInfo.redirectUrl = localStorage.getItem("dj-location");
-        localStorage.getItem("userInfo") &&
+      this.reloadCaptcha()
-        JSON.parse(localStorage.getItem("userInfo"));
+      let self = this;
-      if (userInfo) {
+      document.onkeydown = function (e) {
-        this.userInfo.username = userInfo.username;
+        //按下回车提交
-        this.userInfo.password = userInfo.password;
+        let key = window.event.keyCode;
-      }
+        //事件中keycode=13为回车事件
+        if (key == 13) {
+          self.goHome();
+        }
+      };
    },
-    goHome() {
+    methods: {
-      if (this.userInfo.username && this.userInfo.password) {
+      // 更新验证码
-        axios
+      reloadCaptcha () {
-          .post(
+        axios.get(window._config.services.management + "/management/captcha?format=json").then(res => {
-            window._config.services.management + "/management/cas/login",
+          if (res.data.status === 1) {
-            this.userInfo
+            this.userInfo.captchaKey = res.data.content['dubhe.captcha']
-          )
+            this.codeSrc = res.data.content.image
-          .then((response) => {
+          }
-            if (response.data.status === 1) {
+        })
-              if (response.data.content.location) {
+      },
-                window.location.href = response.data.content.location;
+      // 初始化
+      initPage () {
+        let userInfo =
+          localStorage.getItem("userInfo") &&
+          JSON.parse(localStorage.getItem("userInfo"));
+        if (userInfo) {
+          this.userInfo.username = userInfo.username;
+          this.userInfo.password = userInfo.password;
+        }
+      },
+      goHome () {
+        if (this.userInfo.username && this.userInfo.password) {
+          axios
+            .post(
+              window._config.services.management + "/management/cas/login",
+              this.userInfo
+            )
+            .then((response) => {
+              if (response.data.status === 1) {
+                if (response.data.content.location) {
+                  window.location.href = response.data.content.location;
+                }
+              } else {
+                this.$message.error(response.data.message);
              }
+            })
+            .catch((error) => {
+              console.log(error);
+              this.$message.error(error.message);
+            });
+        } else {
+          return
+        }
+      },
+      selectEyes () {
+        this.selectEye = !this.selectEye;
+      },
+      //获取焦点
+      reduceBorder (type) {
+        this.change[type] = true
+      },
+      addBorder (type) {
+        //失去焦点
+        switch (type) {
+          case "user":
+            this.change.user = false;
+            if (!this.userInfo.username) {
+              this.warning.user = true;
            } else {
-              this.$message.error(response.data.message);
+              this.warning.user = false;
            }
-          })
+            break;
-          .catch((error) => {
+          case "pass":
-            console.log(error);
+            this.change.pass = false;
-            this.$message.error(error.message);
+            if (!this.userInfo.password) {
-          });
+              this.warning.pass = true;
-      } else {
+            } else {
-        return
+              this.warning.pass = false;
+            }
+            break;
+          case "valid":
+            this.change.valid = false;
+            if (!this.userInfo.captchaCode) {
+              this.warning.valid = true;
+            } else {
+              this.warning.valid = false;
+            }
+            break;
+          default:
+            break;
+        }
      }
    },
-    selectEyes() {
+  };
-      this.selectEye = !this.selectEye;
-    },
-    //获取焦点
-    reduceBorder(type) {
-      this.change[type] = true
-    },
-    addBorder(type) {
-      //失去焦点
-      switch (type) {
-        case "user":
-          this.change.user = false;
-          if (!this.userInfo.username) {
-            this.warning.user = true;
-          } else {
-            this.warning.user = false;
-          }
-          break;
-        case "pass":
-          this.change.pass = false;
-          if (!this.userInfo.password) {
-            this.warning.pass = true;
-          } else {
-            this.warning.pass = false;
-          }
-          break;
-        case "valid":
-          this.change.valid = false;
-          if (!this.userInfo.captchaCode) {
-            this.warning.valid = true;
-          } else {
-            this.warning.valid = false;
-          }
-          break;
-        default:
-          break;
-      }
-    }
-  },
-};
 </script>
 <style lang="scss" scoped>
-input::placeholder{
+  input::placeholder {
-  color: #878787;
+    color: #878787;
-  font-size: 14px;
+    font-size: 14px;
-  font-family:Arial, Helvetica, sans-serif
+    font-family: Arial, Helvetica, sans-serif;
-}
-#login {
-  width: 100vw;
-  height: 100vh;
-  background: url("./images/login-bg.png") no-repeat;
-  background-size: 100%;
-  overflow: hidden;
-  position: relative;
-  .login-content-wrap{
-    position: absolute;
-    left: 50%;
-    top: calc(50% + 10px);
-    transform: translate(-50%, -50%);
-  }
-  .login-logo {
-    height: 70px;
-    width: 100%;
-    text-align: center;
-    position: absolute;
-    top: -140px;
-  }
-  .login-logo img {
-    height: 100%;
  }
-  .login-con {
+  #login {
-    margin: 0 auto;
+    width: 100vw;
-    width: 936px;
+    height: 100vh;
-    height: 450px;
+    background: url("./images/login-bg.png") no-repeat;
-    .login-img{
+    background-size: 100%;
-      width: 456px;
+    overflow: hidden;
-      height: 450px;
+    position: relative;
-      float: left;
+    .login-content-wrap {
-      box-sizing: border-box;
+      position: absolute;
-      padding: 126px 86px;
+      left: 50%;
-      background-color: #fff;
+      top: calc(50% + 10px);
-      position: relative;
+      transform: translate(-50%, -50%);
-      &:after{
-        content: "";
-        display: inline-block;
-        width: 1px;
-        height: calc(100% - 96px);
-        background-image: linear-gradient(#fff,#9AA4C8,#fff);
-        position: absolute;
-        right: 0;
-        top: 48px;
-      }
-      .content{
-        width: 100%;
-        height: 100%;
-        background: url("./images/login-img.svg") no-repeat;
-      }
    }
-    .login-wrap{
+    .login-logo {
-      width: 480px;
+      height: 70px;
+      width: 100%;
+      text-align: center;
+      position: absolute;
+      top: -140px;
+    }
+    .login-logo img {
+      height: 100%;
+    }
+    .login-con {
+      margin: 0 auto;
+      width: 936px;
      height: 450px;
-      float: left;
+      .login-img {
-      box-sizing: border-box;
+        width: 456px;
-      padding: 48px 56px;
+        height: 450px;
-      background: #FFFFFF;
+        float: left;
-      p{
+        box-sizing: border-box;
-        width: 80px;
+        padding: 126px 86px;
-        font-size: 20px;
+        background-color: #fff;
-        font-weight: 500;
-        color: #333333;
-        line-height: 26px;
        position: relative;
-        &:after{
+        &:after {
          content: "";
          display: inline-block;
-          height: 2px;
+          width: 1px;
-          width: 74px;
+          height: calc(100% - 96px);
-          background-color: #CF8933;
+          background-image: linear-gradient(#fff, #9aa4c8, #fff);
          position: absolute;
-          bottom: -4px;
+          right: 0;
-          left: 2px;
+          top: 48px;
+        }
+        .content {
+          width: 100%;
+          height: 100%;
+          background: url("./images/login-img.svg") no-repeat;
+        }
+      }
+      .login-wrap {
+        width: 480px;
+        height: 450px;
+        float: left;
+        box-sizing: border-box;
+        padding: 48px 56px;
+        background: #ffffff;
+        p {
+          width: 80px;
+          font-size: 20px;
+          font-weight: 500;
+          color: #333333;
+          line-height: 26px;
+          position: relative;
+          &:after {
+            content: "";
+            display: inline-block;
+            height: 2px;
+            width: 74px;
+            background-color: #cf8933;
+            position: absolute;
+            bottom: -4px;
+            left: 2px;
+          }
        }
      }
    }
-  }
+    .login-user {
-  .login-user {
+      width: 100%;
-    width: 100%;
+      height: 40px;
-    height: 40px;
+      border: 1px solid #e5e5e5;
-    border: 1px solid #E5E5E5;
+      box-sizing: border-box;
-    box-sizing: border-box;
+      margin-top: 34px;
-    margin-top: 34px;
+      border-radius: 2px;
-    border-radius: 2px;
+      position: relative;
-    position: relative;
+      .user-icon {
-    .user-icon {
+        float: left;
-      float: left;
+        margin: 10px auto auto 10px;
-      margin: 10px auto auto 10px;
+        width: 28px;
-      width: 28px;
+        height: 18px;
-      height: 18px;
+      }
+      .user-input {
+        width: 80%;
+        float: left;
+        font-size: 16px;
+        outline: 0;
+        border: none;
+        color: #4a4a4a;
+        height: 38px;
+        line-height: 40px;
+      }
+      .password-eye {
+        float: right;
+        width: 16px;
+        height: 16px;
+        margin-right: 12px;
+        margin-top: 13px;
+        cursor: pointer;
+      }
+      .warning {
+        font-size: 12px;
+        color: red;
+        position: absolute;
+        left: 0;
+        bottom: -18px;
+      }
    }
-    .user-input {
+    .login-valid {
-      width: 80%;
+      width: 60%;
-      float: left;
+      .valid-img {
-      font-size: 16px;
+        width: 50%;
-      outline: 0;
+        position: absolute;
-      border: none;
+        right: -66%;
-      color: #4a4a4a;
+        top: 2px;
-      height: 38px;
+        cursor: pointer;
-      line-height: 40px;
+      }
    }
-    .password-eye {
+    .user-mt {
-      float: right;
+      margin-top: 26px;
-      width: 16px;
-      height: 16px;
-      margin-right: 12px;
-      margin-top: 13px;
-      cursor: pointer;
    }
-    .warning {
+    .select-border {
-      font-size: 12px;
+      border: 1px solid rgba(0, 113, 255, 1);
-      color: red;
-      position: absolute;
-      left: 0;
-      bottom: -18px;
    }
-  }
+    .login-btn {
-  .login-valid{
+      width: 100%;
-    width: 60%;
+      height: 48px;
-    .valid-img{
+      background: #74a3f5;
-      width: 50%;
+      border-radius: 2px;
-      position: absolute;
+      margin: 0 auto;
-      right: -66%;
+      margin-top: 40px;
-      top: 2px;
+      font-size: 20px;
+      font-weight: 500;
+      line-height: 48px;
+      text-align: center;
+      color: #fff;
      cursor: pointer;
    }
+    .reserved-con {
+      position: absolute;
+      bottom: 0;
+      width: 100%;
+      height: 18px;
+      background-color: #4971ca;
+    }
  }
-  .user-mt {
-    margin-top: 26px;
-  }
-  .select-border {
-    border: 1px solid rgba(0, 113, 255, 1);
-  }
-  .login-btn {
-    width: 100%;
-    height: 48px;
-    background: #74A3F5;
-    border-radius: 2px;
-    margin: 0 auto;
-    margin-top: 40px;
-    font-size: 20px;
-    font-weight: 500;
-    line-height: 48px;
-    text-align: center;
-    color: #fff;
-    cursor: pointer;
-  }
-  .reserved-con {
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    height: 18px;
-    background-color: #4971ca;
-  }
-}
 </style>
--- a/src/views/lpb/index.vue
View file @1814739
+++ b/src/views/lpb/index.vue
View file @1814739
+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-19 09:50:51
+-->
 <template>
  <div class="edit">
    <el-tabs type="card" v-model="activeName">
@@ -9,15 +14,13 @@
      v-if="activeName == 'first'"
      ref="tabContent"
      :style="{ height: lpbContentHight + 'px' }"
-      v-show="bjztFlag"
+      v-show="bjztFlag">
-    >
      <!-- 楼盘表主体 -->
      <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
        <lpbContent
          ref="lpbContent"
          :zrzbsm="formData.bsm"
-          :key="time"
+          :key="time"></lpbContent>
-        ></lpbContent>
      </div>
      <!-- 右侧图例 -->
      <div class="lp-legend">
@@ -28,40 +31,34 @@
          </div>
          <div
            :class="selectedZt == 'dyzt' ? 'dyzt selectedZt' : 'dyzt'"
-            @click="selectedZt = 'dyzt'"
+            @click="selectedZt = 'dyzt'">
-          >
            <span>单元状态</span>
          </div>
          <div
            :class="selectedZt == 'fwxz' ? 'fwxz selectedZt' : 'fwxz'"
-            @click="selectedZt = 'fwxz'"
+            @click="selectedZt = 'fwxz'">
-          >
            <span>房屋性质</span>
          </div>
          <div
            :class="selectedZt == 'fwyt' ? 'fwyt selectedZt' : 'fwyt'"
-            @click="selectedZt = 'fwyt'"
+            @click="selectedZt = 'fwyt'">
-          >
            <span>房屋用途</span>
          </div>
          <div
            :class="selectedZt == 'qsx' ? 'qsx selectedZt' : 'qsx'"
-            @click="selectedZt = 'qsx'"
+            @click="selectedZt = 'qsx'">
-          >
            <span>缺失项</span>
          </div>
        </div>
        <div
          class="legendTable-wrap"
-          :style="{ width: legendToggleFlag ? '200px' : '0' }"
+          :style="{ width: legendToggleFlag ? '200px' : '0' }">
-        >
          <table
            class="legendTable"
            v-show="selectedZt == 'dyzt'"
            cellspacing="1"
            cellpadding="1"
-            border="1"
+            border="1">
-          >
            <tr>
              <th>状态</th>
              <th>套数</th>
@@ -71,14 +68,11 @@
              v-for="(item, index) in dyztList"
              :key="index"
              class="cp"
-              @click="handleChoosedH(item.bsms, item.color)"
+              @click="handleChoosedH(item.bsms, item.color)">
-            >
              <td>
                <i
                  class="fa fa-circle"
-                  :style="{ backgroundColor: item.color }"
+                  :style="{ backgroundColor: item.color }"></i>{{ item.name }}
-                ></i
-                >{{ item.name }}
              </td>
              <td>{{ item.ts }}</td>
              <td>{{ item.mj }}</td>
@@ -90,8 +84,7 @@
            v-show="selectedZt == 'fwxz'"
            cellspacing="1"
            cellpadding="1"
-            border="1"
+            border="1">
-          >
            <tr>
              <th>性质</th>
              <th>套数</th>
@@ -101,14 +94,11 @@
              v-for="(item, index) in fwxzList"
              :key="index"
              class="cp"
-              @click="handleChoosedH(item.bsms, item.color)"
+              @click="handleChoosedH(item.bsms, item.color)">
-            >
              <td>
                <i
                  class="fa fa-circle"
-                  :style="{ backgroundColor: item.color }"
+                  :style="{ backgroundColor: item.color }"></i>{{ item.name }}
-                ></i
-                >{{ item.name }}
              </td>
              <td>{{ item.ts }}</td>
              <td>{{ item.mj }}</td>
@@ -123,8 +113,7 @@
            v-show="selectedZt == 'fwyt'"
            cellspacing="1"
            cellpadding="1"
-            border="1"
+            border="1">
-          >
            <tr>
              <th>用途</th>
              <th>套数</th>
@@ -134,14 +123,11 @@
              v-for="(item, index) in fwytList"
              :key="index"
              class="cp"
-              @click="handleChoosedH(item.bsms, item.color)"
+              @click="handleChoosedH(item.bsms, item.color)">
-            >
              <td>
                <i
                  class="fa fa-circle"
-                  :style="{ backgroundColor: item.color }"
+                  :style="{ backgroundColor: item.color }"></i>{{ item.name }}
-                ></i
-                >{{ item.name }}
              </td>
              <td>{{ item.ts }}</td>
              <td>{{ item.mj }}</td>
@@ -156,8 +142,7 @@
            v-show="selectedZt == 'qsx'"
            cellspacing="1"
            cellpadding="1"
-            border="1"
+            border="1">
-          >
            <tr>
              <th>数据缺失项</th>
              <th>套数</th>
@@ -167,14 +152,11 @@
              v-for="(item, index) in qsxList"
              :key="index"
              class="cp"
-              @click="handleChoosedH(item.bsms, item.color)"
+              @click="handleChoosedH(item.bsms, item.color)">
-            >
              <td>
                <i
                  class="fa fa-circle"
-                  :style="{ backgroundColor: item.color }"
+                  :style="{ backgroundColor: item.color }"></i>{{ item.name }}
-                ></i
-                >{{ item.name }}
              </td>
              <td>{{ item.ts }}</td>
              <td>0</td>
@@ -192,386 +174,386 @@
 </template>
 <script>
-import lpbContent from "./lpbContent/index";
+  import lpbContent from "./lpbContent/index";
-import selectZrzH from "../ywbl/ywsq/components/selectZrzH";
+  import selectZrzH from "../ywbl/ywsq/components/selectZrzH";
-import { getLpbFwytAndQlxz, getLpbQsxtj, getLpbTj } from "@/api/lpcx.js";
+  import { getLpbFwytAndQlxz, getLpbQsxtj, getLpbTj } from "@/api/lpcx.js";
-export default {
+  export default {
-  name: "lpb",
+    name: "lpb",
-  props: {
+    props: {
-    formData: {
+      formData: {
-      type: Object,
+        type: Object,
-      default: {},
+        default: {},
+      },
    },
-  },
+    components: {
-  components: {
+      lpbContent,
-    lpbContent,
+      selectZrzH,
-    selectZrzH,
-  },
-  data() {
-    return {
-      activeName: "first",
-      bsms: [],
-      dialogVisible: false,
-      scyclx: "0", //1是实测  0是预测
-      menuType: "",
-      selectedZt: "dyzt", //图例选中项，默认选中单元状态
-      dyztList: [
-        {
-          name: "未确权",
-          color: "#83AAFE",
-          ts: "12",
-          mj: "1633",
-        },
-        {
-          name: "已确权",
-          color: "#6EDEE1",
-          ts: "22",
-          mj: "3109",
-        },
-        {
-          name: "已备案",
-          color: "#8ADC88",
-          ts: "3",
-          mj: "409",
-        },
-        {
-          name: "预抵押",
-          color: "#F2AD67",
-          ts: "11",
-          mj: "1466",
-        },
-        {
-          name: "在建抵押",
-          color: "#F191C8",
-          ts: "13",
-          mj: "1792",
-        },
-        {
-          name: "抵押",
-          color: "#FF8282",
-          ts: "14",
-          mj: "13",
-        },
-        {
-          name: "查封",
-          color: "#D7CECF",
-          ts: "9",
-          mj: "1436",
-        },
-        {
-          name: "异议",
-          color: "#D4A3EB",
-          ts: "34",
-          mj: "4342",
-        },
-        {
-          name: "限制",
-          color: "#A5A3FB",
-          ts: "2",
-          mj: "285",
-        },
-      ],
-      fwxzList: [],
-      fwytList: [],
-      qsxList: [],
-      legendToggleFlag: false,
-      lpbContentHight: "",
-      lpbContentwidth: "",
-      time: "",
-      dyztBsmList: {}, //单元状态bsmList
-      bjztFlag: true,
-      qsztList: [],
-    };
-  },
-  created() {
-    window.addEventListener("resize", this.getHeight);
-    console.log(this.formData);
-    this.getHeight();
-  },
-  mounted() {
-    //获取各项单元状态的户bsm
-    this.getDyztBsmList();
-    //获取房屋用途统计数据
-    this.getLpbFwytAndQlxz();
-    // 楼盘表绘制区域宽度计算：楼盘表区域宽度-图例宽度34-滚动条宽度6
-    setTimeout(() => {
-      this.lpbContentwidth =
-        (document.documentElement.clientWidth || document.body.clientWidth) -
-        340 -
-        34 -
-        6;
-    }, 100);
-  },
-  methods: {
-    /* handleTabClick(event){
-			if(event.name=="first"){
-				this.$router.push({
-					path:"/lpb/index",
-				})
-			}else if(event.name=="second"){
-				this.$router.push({
-				path:"/ywbl/ywsq/components/selectAllHInfo",
-				})
-			}
-			},*/
-    //获取高度计算lpb内容区高度
-    getHeight() {
-      this.lpbContentHight = window.innerHeight - 190;
    },
-    //图例的展开收起
+    data () {
-    legendToggle() {
+      return {
-      this.legendToggleFlag = !this.legendToggleFlag;
+        activeName: "first",
+        bsms: [],
+        dialogVisible: false,
+        scyclx: "0", //1是实测  0是预测
+        menuType: "",
+        selectedZt: "dyzt", //图例选中项，默认选中单元状态
+        dyztList: [
+          {
+            name: "未确权",
+            color: "#83AAFE",
+            ts: "12",
+            mj: "1633",
+          },
+          {
+            name: "已确权",
+            color: "#6EDEE1",
+            ts: "22",
+            mj: "3109",
+          },
+          {
+            name: "已备案",
+            color: "#8ADC88",
+            ts: "3",
+            mj: "409",
+          },
+          {
+            name: "预抵押",
+            color: "#F2AD67",
+            ts: "11",
+            mj: "1466",
+          },
+          {
+            name: "在建抵押",
+            color: "#F191C8",
+            ts: "13",
+            mj: "1792",
+          },
+          {
+            name: "抵押",
+            color: "#FF8282",
+            ts: "14",
+            mj: "13",
+          },
+          {
+            name: "查封",
+            color: "#D7CECF",
+            ts: "9",
+            mj: "1436",
+          },
+          {
+            name: "异议",
+            color: "#D4A3EB",
+            ts: "34",
+            mj: "4342",
+          },
+          {
+            name: "限制",
+            color: "#A5A3FB",
+            ts: "2",
+            mj: "285",
+          },
+        ],
+        fwxzList: [],
+        fwytList: [],
+        qsxList: [],
+        legendToggleFlag: false,
+        lpbContentHight: "",
+        lpbContentwidth: "",
+        time: "",
+        dyztBsmList: {}, //单元状态bsmList
+        bjztFlag: true,
+        qsztList: [],
+      };
    },
-    //切换房屋状态
+    created () {
-    handleChoosedH(bsms, color) {
+      window.addEventListener("resize", this.getHeight);
-      this.$refs.lpbContent.changeChoosed(bsms, color);
+      console.log(this.formData);
+      this.getHeight();
    },
-    //获取各项单元状态统计数据
+    mounted () {
-    getDyztBsmList() {
+      //获取各项单元状态的户bsm
-      getLpbTj(this.formData.bsm).then((res) => {
+      this.getDyztBsmList();
-        if (res.code === 200) {
+      //获取房屋用途统计数据
-          this.dyztList = res.result;
+      this.getLpbFwytAndQlxz();
-          this.dyztList.splice(1, 0, this.dyztList[8]);
+      // 楼盘表绘制区域宽度计算：楼盘表区域宽度-图例宽度34-滚动条宽度6
-          this.dyztList.pop();
+      setTimeout(() => {
-          this.dyztList.forEach((item) => {
+        this.lpbContentwidth =
-            item.ts = item.bsms.length;
+          (document.documentElement.clientWidth || document.body.clientWidth) -
-            switch (item.name) {
+          340 -
-              case "Qqzt":
+          34 -
-                item.color = "#6EDEE1";
+          6;
-                item.name = "已确权";
+      }, 100);
-                break;
-              case "Wqqzt":
-                item.color = "#83AAFE";
-                item.name = "未确权";
-                break;
-              case "Bazt":
-                item.color = "#8ADC88";
-                item.name = "已备案";
-                break;
-              case "Ydyzt":
-                item.color = "#F2AD67";
-                item.name = "预抵押";
-                break;
-              case "Zjgcdyzt":
-                item.color = "#F191C8";
-                item.name = "在建抵押";
-                break;
-              case "Dyzt":
-                item.color = "#FF8282";
-                item.name = "抵押";
-                break;
-              case "Cfzt":
-                item.color = "#D7CECF";
-                item.name = "查封";
-                break;
-              case "Yyzt":
-                item.color = "#D4A3EB";
-                item.name = "异议";
-                break;
-              case "Xzzt":
-                item.color = "#A5A3FB";
-                item.name = "限制";
-                break;
-              default:
-                break;
-            }
-          });
-        }
-      });
    },
-    // 获取房屋用途和房屋性质及缺失项统计数据
+    methods: {
-    getLpbFwytAndQlxz() {
+      /* handleTabClick(event){
-      getLpbFwytAndQlxz(this.formData.bsm).then((res) => {
+        if(event.name=="first"){
-        if (res.code === 200) {
+          this.$router.push({
-          // this.fwytList = res.result
+            path:"/lpb/index",
-          this.fwytList = res.result.fwyt;
+          })
-          this.fwxzList = res.result.qlxz;
+        }else if(event.name=="second"){
-          if (this.fwytList.length > 0) {
+          this.$router.push({
-            this.fwytList.forEach((item) => {
+          path:"/ywbl/ywsq/components/selectAllHInfo",
-              item.color = "#2591FD";
+          })
+        }
+        },*/
+      //获取高度计算lpb内容区高度
+      getHeight () {
+        this.lpbContentHight = window.innerHeight - 190;
+      },
+      //图例的展开收起
+      legendToggle () {
+        this.legendToggleFlag = !this.legendToggleFlag;
+      },
+      //切换房屋状态
+      handleChoosedH (bsms, color) {
+        this.$refs.lpbContent.changeChoosed(bsms, color);
+      },
+      //获取各项单元状态统计数据
+      getDyztBsmList () {
+        getLpbTj(this.formData.bsm).then((res) => {
+          if (res.code === 200) {
+            this.dyztList = res.result;
+            this.dyztList.splice(1, 0, this.dyztList[8]);
+            this.dyztList.pop();
+            this.dyztList.forEach((item) => {
              item.ts = item.bsms.length;
+              switch (item.name) {
+                case "Qqzt":
+                  item.color = "#6EDEE1";
+                  item.name = "已确权";
+                  break;
+                case "Wqqzt":
+                  item.color = "#83AAFE";
+                  item.name = "未确权";
+                  break;
+                case "Bazt":
+                  item.color = "#8ADC88";
+                  item.name = "已备案";
+                  break;
+                case "Ydyzt":
+                  item.color = "#F2AD67";
+                  item.name = "预抵押";
+                  break;
+                case "Zjgcdyzt":
+                  item.color = "#F191C8";
+                  item.name = "在建抵押";
+                  break;
+                case "Dyzt":
+                  item.color = "#FF8282";
+                  item.name = "抵押";
+                  break;
+                case "Cfzt":
+                  item.color = "#D7CECF";
+                  item.name = "查封";
+                  break;
+                case "Yyzt":
+                  item.color = "#D4A3EB";
+                  item.name = "异议";
+                  break;
+                case "Xzzt":
+                  item.color = "#A5A3FB";
+                  item.name = "限制";
+                  break;
+                default:
+                  break;
+              }
            });
          }
-          if (this.fwxzList.length > 0) {
+        });
-            this.fwxzList.forEach((item) => {
+      },
-              item.color = "#2591FD";
+      // 获取房屋用途和房屋性质及缺失项统计数据
-              item.ts = item.bsms.length;
+      getLpbFwytAndQlxz () {
-            });
+        getLpbFwytAndQlxz(this.formData.bsm).then((res) => {
+          if (res.code === 200) {
+            // this.fwytList = res.result
+            this.fwytList = res.result.fwyt;
+            this.fwxzList = res.result.qlxz;
+            if (this.fwytList.length > 0) {
+              this.fwytList.forEach((item) => {
+                item.color = "#2591FD";
+                item.ts = item.bsms.length;
+              });
+            }
+            if (this.fwxzList.length > 0) {
+              this.fwxzList.forEach((item) => {
+                item.color = "#2591FD";
+                item.ts = item.bsms.length;
+              });
+            }
          }
-        }
+        });
-      });
+        getLpbQsxtj(this.formData.bsm).then((res) => {
-      getLpbQsxtj(this.formData.bsm).then((res) => {
+          if (res.code === 200) {
-        if (res.code === 200) {
+            this.qsxList = [
-          this.qsxList = [
+              {
-            {
+                name: "坐落",
-              name: "坐落",
+                bsms: res.result.zl.bsms,
-              bsms: res.result.zl.bsms,
+                color: "#2591FD",
-              color: "#2591FD",
+                ts: res.result.zl.bsms.length,
-              ts: res.result.zl.bsms.length,
+              },
-            },
+              {
-            {
+                name: "分层分户图",
-              name: "分层分户图",
+                bsms: res.result.fcfht.bsms,
-              bsms: res.result.fcfht.bsms,
+                color: "#2591FD",
-              color: "#2591FD",
+                ts: res.result.fcfht.bsms.length,
-              ts: res.result.fcfht.bsms.length,
+              },
-            },
+              {
-            {
+                name: "室号",
-              name: "室号",
+                bsms: res.result.shbw.bsms,
-              bsms: res.result.shbw.bsms,
+                color: "#2591FD",
-              color: "#2591FD",
+                ts: res.result.shbw.bsms.length,
-              ts: res.result.shbw.bsms.length,
+              },
-            },
+            ];
-          ];
+          }
-        }
+        });
-      });
+      },
    },
-  },
+    computed: {},
-  computed: {},
+    destroyed () {
-  destroyed() {
+      window.removeEventListener("resize", this.getHeight);
-    window.removeEventListener("resize", this.getHeight);
-  },
-  watch: {
-    //树结构和图例伸缩时修改楼盘表主要内容区宽度
-    legendToggleFlag(n) {
-      if (n) {
-        this.lpbContentwidth -= 204;
-      } else {
-        this.lpbContentwidth += 204;
-      }
    },
-    selectedZt(n) {
+    watch: {
-      this.legendToggleFlag = true;
+      //树结构和图例伸缩时修改楼盘表主要内容区宽度
+      legendToggleFlag (n) {
+        if (n) {
+          this.lpbContentwidth -= 204;
+        } else {
+          this.lpbContentwidth += 204;
+        }
+      },
+      selectedZt (n) {
+        this.legendToggleFlag = true;
+      },
    },
-  },
+  };
-};
 </script>
 <style scoped lang="scss">
-table {
+  table {
-  border-width: 0;
+    border-width: 0;
-  border-collapse: collapse;
+    border-collapse: collapse;
-  border-spacing: 0;
+    border-spacing: 0;
-}
+  }
-.edit {
+  .edit {
-  height: 100%;
+    height: 100%;
-  background-color: #f4f9ff;
+    background-color: #f4f9ff;
-  .tab-content {
+    .tab-content {
-    border: 1px solid #dedede;
+      border: 1px solid #dedede;
-    border-left: 0;
+      border-left: 0;
-    background-color: #ffffff;
+      background-color: #ffffff;
-    display: flex;
+      display: flex;
-    &::-webkit-scrollbar {
+      &::-webkit-scrollbar {
-      width: 1px;
+        width: 1px;
-    }
-    .lp-tree {
-      height: 100%;
-      overflow: hidden;
-      transition: 0.5s;
-      .treeData {
-        margin-top: 20px;
-        margin-left: 26px;
-        float: left;
      }
-    }
+      .lp-tree {
-    .w0 {
-      width: 0;
-    }
-    .w260 {
-      width: 260px;
-    }
-    .lp-overview {
-      transition: 0.5s;
-      flex: 1;
-      border: 1px solid rgb(236, 236, 236);
-      border-top: 0;
-      border-bottom: 0;
-      margin-right: 10px;
-      box-sizing: border-box;
-    }
-    .lp-legend {
-      transition: 0.5s;
-      height: 100%;
-      font-size: 14px;
-      .handleCol {
-        width: 34px;
-        float: right;
        height: 100%;
-        .btn {
+        overflow: hidden;
-          cursor: pointer;
+        transition: 0.5s;
-          height: 40px;
+        .treeData {
-          line-height: 40px;
+          margin-top: 20px;
-          text-align: center;
+          margin-left: 26px;
-          background-color: #5a78de;
+          float: left;
-          color: #fff;
-          border-bottom: 1px solid #e6e6e6;
-        }
-        .dyzt,
-        .fwxz,
-        .fwyt,
-        .qsx {
-          height: 122px;
-        }
-        .dyzt,
-        .fwxz,
-        .fwyt,
-        .qsx {
-          cursor: pointer;
-          border-bottom: 1px solid #e6e6e6;
-          border-left: 1px solid #e6e6e6;
-          span {
-            text-align: center;
-            height: 100%;
-            -webkit-writing-mode: vertical-rl;
-            writing-mode: vertical-rl;
-            line-height: 34px;
-            letter-spacing: 2px;
-          }
-        }
-        .selectedZt {
-          // background-color: #5A78DE;
-          color: #3d59c4;
        }
      }
-      .legendTable-wrap {
+      .w0 {
+        width: 0;
+      }
+      .w260 {
+        width: 260px;
+      }
+      .lp-overview {
        transition: 0.5s;
-        float: right;
+        flex: 1;
-        overflow: hidden;
+        border: 1px solid rgb(236, 236, 236);
-        .legendTable {
+        border-top: 0;
-          margin-top: -1px;
+        border-bottom: 0;
-          .fa-circle {
+        margin-right: 10px;
-            display: inline-block;
+        box-sizing: border-box;
-            width: 12px;
+      }
-            height: 12px;
-            border-radius: 50%;
+      .lp-legend {
-            vertical-align: middle;
+        transition: 0.5s;
-            margin-right: 4px;
+        height: 100%;
-          }
+        font-size: 14px;
-          tr {
+        .handleCol {
+          width: 34px;
+          float: right;
+          height: 100%;
+          .btn {
+            cursor: pointer;
            height: 40px;
            line-height: 40px;
-            border-color: #d8e0ea !important;
+            text-align: center;
-            th:first-child {
+            background-color: #5a78de;
-              width: 80px;
+            color: #fff;
+            border-bottom: 1px solid #e6e6e6;
+          }
+          .dyzt,
+          .fwxz,
+          .fwyt,
+          .qsx {
+            height: 122px;
+          }
+          .dyzt,
+          .fwxz,
+          .fwyt,
+          .qsx {
+            cursor: pointer;
+            border-bottom: 1px solid #e6e6e6;
+            border-left: 1px solid #e6e6e6;
+            span {
+              text-align: center;
+              height: 100%;
+              -webkit-writing-mode: vertical-rl;
+              writing-mode: vertical-rl;
+              line-height: 34px;
+              letter-spacing: 2px;
            }
-            th {
+          }
-              width: 60px;
+          .selectedZt {
-              height: 40px;
+            // background-color: #5A78DE;
-              white-space: nowrap;
+            color: #3d59c4;
-              background-color: #eceef2;
+          }
+        }
+        .legendTable-wrap {
+          transition: 0.5s;
+          float: right;
+          overflow: hidden;
+          .legendTable {
+            margin-top: -1px;
+            .fa-circle {
+              display: inline-block;
+              width: 12px;
+              height: 12px;
+              border-radius: 50%;
+              vertical-align: middle;
+              margin-right: 4px;
            }
-            td {
+            tr {
              height: 40px;
-              text-align: center;
+              line-height: 40px;
-              white-space: nowrap;
+              border-color: #d8e0ea !important;
-            }
+              th:first-child {
-            td:first-child {
+                width: 80px;
-              text-align: left;
+              }
-              text-indent: 2px;
+              th {
+                width: 60px;
+                height: 40px;
+                white-space: nowrap;
+                background-color: #eceef2;
+              }
+              td {
+                height: 40px;
+                text-align: center;
+                white-space: nowrap;
+              }
+              td:first-child {
+                text-align: left;
+                text-indent: 2px;
+              }
            }
          }
        }
      }
    }
  }
-}
 </style>
--- a/src/views/registerBook/bdcqldjml.vue
View file @1814739
+++ b/src/views/registerBook/bdcqldjml.vue
View file @1814739
+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-19 09:51:37
+-->
 <template>
  <div class="bdcqldjml">
    <table class="mlTable">
@@ -23,51 +28,51 @@
 </template>
 <script>
-import { getBdcqldjmlByBdcdyid } from "@/api/djbDetail.js";
+  import { getBdcqldjmlByBdcdyid } from "@/api/djbDetail.js";
-export default {
+  export default {
-  data() {
+    data () {
-    return {
+      return {
-      bdcqlml: [],
+        bdcqlml: [],
-      propsParam: this.$attrs,
+        propsParam: this.$attrs,
-    };
+      };
-  },
+    },
-  mounted() {
+    mounted () {
-    getBdcqldjmlByBdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
+      getBdcqldjmlByBdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
-      if (res.code === 200) {
+        if (res.code === 200) {
-        this.bdcqlml = res.result;
+          this.bdcqlml = res.result;
-      }
+        }
-    });
+      });
-  },
+    },
-};
+  };
 </script>
 <style lang="scss" scoped>
-.bdcqldjml {
+  .bdcqldjml {
-  width: 100%;
+    width: 100%;
-  height: 100%;
+    height: 100%;
-  background: #fff;
+    background: #fff;
-  overflow-y: scroll;
+    overflow-y: scroll;
-  .mlTable {
+    .mlTable {
-    width: 90%;
+      width: 90%;
-    margin: 0 auto;
+      margin: 0 auto;
-    color: #333;
+      color: #333;
-    border-spacing: 1px;
+      border-spacing: 1px;
-    background-color: #333;
+      background-color: #333;
-    .title {
+      .title {
-      font-size: 20px;
+        font-size: 20px;
-      line-height: 60px;
+        line-height: 60px;
-      font-family: serif;
+        font-family: serif;
-      position: relative;
+        position: relative;
-    }
+      }
-    td,
+      td,
-    th {
+      th {
-      background-color: white;
+        background-color: white;
-      line-height: 30px;
+        line-height: 30px;
-      padding: 0 4px;
+        padding: 0 4px;
-      text-align: center;
+        text-align: center;
+      }
    }
  }
-}
 </style>
--- a/src/views/registerBook/bdcqljqtsx.vue
View file @1814739
+++ b/src/views/registerBook/bdcqljqtsx.vue
View file @1814739
+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-19 09:52:07
+-->
 <template>
  <div class="bdcqljqtsx">
    <div class="content">
@@ -49,59 +54,59 @@
 </template>
 <script>
-import { getBdcqljqtsx } from "@/api/djbDetail.js";
+  import { getBdcqljqtsx } from "@/api/djbDetail.js";
-export default {
+  export default {
-  name: "bdcqljqtsx",
+    name: "bdcqljqtsx",
-  data() {
+    data () {
-    return {
+      return {
-      //传递参数
+        //传递参数
-      propsParam: this.$attrs,
+        propsParam: this.$attrs,
-      qlxxList: "",
+        qlxxList: "",
-    };
+      };
-  },
+    },
-  mounted() {
+    mounted () {
-    getBdcqljqtsx({
+      getBdcqljqtsx({
-      bdcdyid: this.propsParam.bdcdyid,
+        bdcdyid: this.propsParam.bdcdyid,
-      bdcdyh: this.propsParam.bdcdyh,
+        bdcdyh: this.propsParam.bdcdyh,
-    }).then((res) => {
+      }).then((res) => {
-      if (res.code === 200) {
+        if (res.code === 200) {
-        this.qlxxList = res.result;
+          this.qlxxList = res.result;
-      }
+        }
-    });
+      });
-  },
+    },
-};
+  };
 </script>
 <style lang="scss" scoped>
-.bdcqljqtsx {
+  .bdcqljqtsx {
-  width: 100%;
+    width: 100%;
-  height: 100%;
-  background: #fff;
-  .content {
-    width: 50%;
    height: 100%;
-    margin: 0 auto;
+    background: #fff;
-    text-align: right;
-    color: #333;
-    font-family: "Arial Negreta", "Arial Normal", "Arial", sans-serif;
-    font-weight: 700;
-    font-size: 18px;
-    line-height: 16px;
-    .title {
+    .content {
-      font-size: 32px;
+      width: 50%;
-      text-align: center;
+      height: 100%;
-      padding: 40px 0;
+      margin: 0 auto;
-      line-height: 34px;
+      text-align: right;
-    }
+      color: #333;
+      font-family: "Arial Negreta", "Arial Normal", "Arial", sans-serif;
+      font-weight: 700;
+      font-size: 18px;
+      line-height: 16px;
-    .underline {
+      .title {
-      font-size: 14px;
+        font-size: 32px;
-      font-weight: normal;
+        text-align: center;
-      text-decoration: underline;
+        padding: 40px 0;
-      display: inline-block;
+        line-height: 34px;
+      }
+      .underline {
+        font-size: 14px;
+        font-weight: normal;
+        text-decoration: underline;
+        display: inline-block;
+      }
    }
  }
-}
 </style>
--- a/src/views/registerBook/cfdj.vue
View file @1814739
+++ b/src/views/registerBook/cfdj.vue
View file @1814739
+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-19 09:52:13
+-->
 <template>
  <div class="djxxTable">
    <div class="tableBox">
--- a/src/views/registerBook/diyaq.vue
View file @1814739
+++ b/src/views/registerBook/diyaq.vue
View file @1814739
+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-19 09:52:28
+-->
 <template>
  <div class="djxxTable">
    <div class="tableBox">
--- a/src/views/registerBook/diyiq.vue
View file @1814739
+++ b/src/views/registerBook/diyiq.vue
View file @1814739
+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-19 09:52:37
+-->
 <template>
  <div class="djxxTable">
    <div class="tableBox">
--- a/src/views/registerBook/djbFrame.vue
View file @1814739
+++ b/src/views/registerBook/djbFrame.vue
View file @1814739
+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-19 09:52:46
+-->
 <template>
  <div class="content">
    <div class="left">
@@ -69,7 +74,7 @@
        this.componentTag = (r) =>
          require.ensure([], () => r(require("@/views/registerBook/" + form)));
      },
-    },
+    }
  };
 </script>
 <style scoped lang="scss">
--- a/src/views/registerBook/djbFrameall.vue
View file @1814739
+++ b/src/views/registerBook/djbFrameall.vue
View file @1814739
+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-19 09:52:59
+-->
 <template>
  <div class="content loadingtext">
    <div class="left">
--- a/src/views/registerBook/djbfm.vue
View file @1814739
+++ b/src/views/registerBook/djbfm.vue
View file @1814739
+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-19 09:52:42
+-->
 <template>
  <div class="djbfm">
    <br /><br />
@@ -33,76 +38,76 @@
 </template>
 <script>
-import { getDjbfm } from "@/api/djbDetail.js";
+  import { getDjbfm } from "@/api/djbDetail.js";
-export default {
+  export default {
-  data () {
+    data () {
-    return {
+      return {
-      //传递参数
+        //传递参数
-      propsParam: this.$attrs,
+        propsParam: this.$attrs,
-      info: {},
+        info: {},
-    };
+      };
-  },
-  mounted () {
-    this.loadData();
-  },
-  methods: {
-    loadData () {
-      getDjbfm({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
-        if (res.code === 200) {
-          this.info = res.result;
-        }
-      });
    },
-  },
+    mounted () {
-};
+      this.loadData();
+    },
+    methods: {
+      loadData () {
+        getDjbfm({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
+          if (res.code === 200) {
+            this.info = res.result;
+          }
+        });
+      },
+    },
+  };
 </script>
 <style lang="scss" scoped>
-.djbfm {
+  .djbfm {
-  width: 100%;
+    width: 100%;
-  height: 100%;
+    height: 100%;
-  background: #fff;
+    background: #fff;
-  border-right: 1px solid #ccc;
+    border-right: 1px solid #ccc;
-  line-height: 45px;
+    line-height: 45px;
-  text-align: center;
+    text-align: center;
-  font-size: 18px;
+    font-size: 18px;
-  font-family: serif;
+    font-family: serif;
-  position: relative;
+    position: relative;
-  font {
+    font {
-    border-bottom: 1px solid #000;
+      border-bottom: 1px solid #000;
-    display: inline-block;
+      display: inline-block;
-    padding: 0 15px;
+      padding: 0 15px;
-    line-height: 16px;
+      line-height: 16px;
-  }
+    }
-  .title {
+    .title {
-    height: 40%;
+      height: 40%;
-    display: flex;
+      display: flex;
-    font-size: 38px;
+      font-size: 38px;
-    color: #000;
+      color: #000;
-    justify-content: center;
+      justify-content: center;
-    align-items: center;
+      align-items: center;
-  }
+    }
-  .bottom {
+    .bottom {
-    position: absolute;
+      position: absolute;
-    bottom: 0px;
+      bottom: 0px;
-    text-align: center;
+      text-align: center;
-    width: 100%;
+      width: 100%;
-    left: 0;
+      left: 0;
-    height: 100px;
+      height: 100px;
-    line-height: 100px;
+      line-height: 100px;
-    p {
+      p {
-      font-size: 28px;
+        font-size: 28px;
-    }
+      }
-    font {
+      font {
-      font-size: 24px;
+        font-size: 24px;
-      line-height: 24px;
+        line-height: 24px;
+      }
    }
  }
-}
 </style>
--- a/src/views/system/dictionaries/components/editDialog.vue
View file @1814739
+++ b/src/views/system/dictionaries/components/editDialog.vue
View file @1814739
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-07-13 16:42:17
+ * @LastEditTime: 2023-07-19 10:23:27
 -->
 <template>
  <div>
@@ -69,19 +69,19 @@
          },
          {
            prop: 'dcode',
-            width: '100',
+            width: '150',
            label: '字典项编码',
            render: (h, scope) => {
              return (
                <div>
                  <el-input placeholder="字典项编码" disabled={this.formData.isenable == 2} v-show={scope.row.codeShow} v-fo value={scope.row[scope.column.property]}
                    onFocus={() => { this.itemShowFalse(); scope.row.codeShow = true; }}
-                    onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }} maxlength='8'></el-input>
+                    onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }} maxlength='20'></el-input>
                  <el-input placeholder="字典项编码" disabled={this.formData.isenable == 2} v-show={!scope.row.codeShow} value={scope.row[scope.column.property]}
                    onFocus={() => { this.itemShowFalse(); scope.row.codeShow = true; }}
-                    onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }} maxlength='8'></el-input>
+                    onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }} maxlength='20'></el-input>
                </div>
              )
            }
@@ -106,17 +106,17 @@
          {
            prop: 'normcode',
            label: '部标编码',
-            width: '100',
+            width: '150',
            render: (h, scope) => {
              return (
                <div>
                  <el-input placeholder="部标编码" disabled={this.formData.isenable == 2} v-show={scope.row.normcodeShow} v-fo value={scope.row[scope.column.property]}
                    onFocus={() => { this.itemShowFalse(); scope.row.normcodeShow = true; }}
-                    onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }} maxlength='8'></el-input>
+                    onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }} maxlength='20'></el-input>
                  <el-input placeholder="部标编码" disabled={this.formData.isenable == 2} v-show={!scope.row.normcodeShow} value={scope.row[scope.column.property]}
                    onFocus={() => { this.itemShowFalse(); scope.row.normcodeShow = true; }}
-                    onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }} maxlength='8'></el-input>
+                    onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }} maxlength='20'></el-input>
                </div>
              )
            }
@@ -152,7 +152,7 @@
            }
          },
          {
-            width: '130',
+            width: '100',
            label: '移动',
            render: (h, scope) => {
              return (
@@ -164,7 +164,7 @@
            }
          },
          {
-            width: '150',
+            width: '130',
            label: '操作',
            render: (h, scope) => {
              return (
@@ -324,9 +324,16 @@
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
  @import "~@/styles/dialogBoxheader.scss";
+  /deep/.el-radio-group {
+    display: flex;
+    justify-content: center;
+  }
  /deep/.el-radio {
    margin-right: 5px !important;
+    display: flex;
+  }
+  /deep/.el-radio__label {
+    display: block !important;
  }
 </style>
--- a/src/views/workflow/components/zdt.vue
View file @1814739
+++ b/src/views/workflow/components/zdt.vue
View file @1814739
 <!--
 * @Description: 
 * @Autor: renchao
- * @LastEditTime: 2023-07-14 16:01:33
+ * @LastEditTime: 2023-07-18 14:26:54
 -->
 <template>
  <canvas id="mxcad">
@@ -36,10 +36,4 @@
      })
    }
  }
-</script>
-<style scoped lang='scss'>
-  #cad-container {
-    width: 100%;
-    height: 100%;
-  }
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file