--no commit message

xiaomiao
Showing 10 changed files with 498 additions and 223 deletions
src/store/modules/workflow.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
--- a/src/store/modules/workflow.js
View file @964c844
+++ b/src/store/modules/workflow.js
View file @964c844
@@ -4,7 +4,7 @@
 * @LastEditTime: 2023-05-04 11:13:36
 */
 const state = {
-  yjsqOptions: {},
+  yjsqOptions: "",
 }
 const mutations = {
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue
View file @964c844
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue
View file @964c844
@@ -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="登记机构："
@@ -442,12 +443,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 +474,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 +503,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 @964c844
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/dyaq.vue
View file @964c844
@@ -9,13 +9,14 @@
    <el-form
      :model="ruleForm"
      :rules="rules"
-         :class="{readonly: editDisabled }"
+      :class="{ readonly: editDisabled }"
      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"
@@ -279,7 +280,11 @@
          </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"
@@ -291,7 +296,11 @@
          </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"
@@ -312,11 +321,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 +366,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 +444,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,12 +460,20 @@
          </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>
@@ -557,7 +598,7 @@ export default {
      ],
      ssQlxxList: [],
      ztQlxxList: [],
-      ableOperation:false,
+      ableOperation: false,
      rules: {
        bdcqzhrules: [
          { required: true, message: "不动产登记证明号", trigger: "blur" },
@@ -570,20 +611,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 +646,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 +702,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 +771,4 @@ export default {
 .el-table__row {
  height: 30px !important;
 }
 </style>
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/dyiq.vue
View file @964c844
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/dyiq.vue
View file @964c844
@@ -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>
@@ -273,13 +301,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 +321,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 +377,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 +458,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 @964c844
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue
View file @964c844
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
View file @964c844
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
View file @964c844
@@ -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="登记机构："
@@ -298,6 +299,11 @@ export default {
  },
  data() {
    return {
+         ssqlxxshow:true,
+        props: {
+        label: "bdcqzh",
+        value: "bdcdyid",
+      },
      // 键名转换，方法默认是label和children进行树状渲染
      normalizer(node) {
        //方法
@@ -313,6 +319,7 @@ export default {
      propsParam: this.$attrs,
      ableOperation:false,
      key: 0,
+        ssQlxxList: [],
      // 登记类型
      djlxlist: [
        {
@@ -360,12 +367,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 +384,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 +415,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 @964c844
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/tdsyq.vue
View file @964c844
@@ -14,6 +14,7 @@
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
      inline-message
      label-width="145px"
    >
@@ -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"
@@ -97,7 +126,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 +134,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="不动产权证号："
@@ -306,11 +335,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 +354,11 @@ export default {
  },
  data() {
    return {
+      ssqlxxshow:true,
+        props: {
+        label: "bdcqzh",
+        value: "bdcdyid",
+      },
      // 键名转换，方法默认是label和children进行树状渲染
      normalizer(node) {
        //方法
@@ -381,36 +416,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 +476,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 +497,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) {
@@ -503,9 +569,5 @@ export default {
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
 @import "~@/styles/slxx/slxx.scss";
-.loadingtext{
- /deep/.el-form-item__content{
-      pointer-events: none!important;
-    }
-}
 </style>
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/ygdj.vue
View file @964c844
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/ygdj.vue
View file @964c844
@@ -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>
@@ -312,12 +341,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 +361,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 +416,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 +435,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 +498,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 @964c844
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/yydj.vue
View file @964c844
@@ -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>
@@ -300,7 +301,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 +317,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 +354,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 @964c844
+++ b/src/views/djbworkflow/djbBook/spyj.vue
View file @964c844
@@ -7,12 +7,6 @@
  <div class="spyj loadingtext">
    <div class="box">
      <div class="spyj_title">
-        <div class="leftadd" v-if="ableOperation">
-                <i
-                  class="el-icon-plus pointer"
-                   @click="addClick()"
-                ></i>
-              </div>
        <div class="righttitle">审批表</div>
      </div>
@@ -20,30 +14,16 @@
        <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"
                      type="textarea"
@@ -52,20 +32,28 @@
                      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="选择日期"
@@ -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: {
    yjsqOptions: {
-        handler (val) {
+      handler(val) {
-          this.add(val)
+        console.log("val", val);
+        this.add(val);
      },
      deep: true,
-        immediate: 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;
        }),
@@ -189,14 +188,21 @@ export default {
      }
    },
    //打开常用意见列表弹窗
-      commonOpinion (index) {
+    commonOpinion(index) {
-        this.currentindex=index
+      this.currentindex = index;
-        this.$popupDialog("常用意见", "workflow/components/dialog/commonOpinion", {}, "70%", true)
+      this.$popupDialog(
+        "常用意见",
+        "workflow/components/dialog/commonOpinion",
+        {},
+        "70%",
+        true
+      );
    },
-      add(val){
+    add(val) {
-        this.$set(this.tableData[this.currentindex],'shyj',val)
+      if (val != "") {
+        this.$set(this.tableData[this.currentindex], "shyj", val);
      }
+    },
  },
 };
 </script>
@@ -220,13 +226,12 @@ export default {
    padding: 20px 40px;
    .spyj_title {
      width: 100%;
-    height:80px;
+      height: 80px;
      border: 1px solid $borderColor;
      background-color: #eceef2;
      display: flex;
    }
-    .leftadd{
+    .leftadd {
      width: 3%;
      height: 100%;
      display: flex;
@@ -234,9 +239,8 @@ export default {
      text-indent: 20px;
      align-items: center;
      border: 1px solid $borderColor;
    }
-     .righttitle{
+    .righttitle {
      width: 80%;
      height: 100%;
      line-height: 80px;
@@ -244,11 +248,9 @@ export default {
      text-align: center;
      font-size: 22px;
      font-weight: 400;
    }
  }
  /deep/.el-form-item {
    margin-bottom: 0;
  }
@@ -267,34 +269,10 @@ 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 {
      flex: 1;
@@ -338,10 +316,8 @@ export default {
    margin: 15px 0;
  }
-  .el-date-editor.el-input{
+  .el-date-editor.el-input {
    width: 100%;
  }
 }
 </style>