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

renchao@pashanhoo.com
Showing 10 changed files with 219 additions and 376 deletions
package.json
public/config.json
src/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue
src/views/djbworkflow/djbBook/components/qllxDailog.vue
src/views/djbworkflow/mixin/index.js
src/views/djbworkflow/workFrame.vue
src/views/registerBook/qlxxFormData.js
src/views/workflow/components/dialog/addTdyt.vue
src/views/workflow/components/tdytTable.vue
src/views/ywbl/slsqxx/jsydsyq/slxx.vue
--- a/package.json
View file @b8ac682
+++ b/package.json
View file @b8ac682
@@ -10,7 +10,6 @@
  "dependencies": {
    "@antv/g2": "^4.2.8",
    "@babel/polyfill": "^7.12.1",
-    "@riophae/vue-treeselect": "^0.4.0",
    "axios": "^0.21.1",
    "bpmn-js": "^7.4.0",
    "bpmn-js-properties-panel": "^0.37.2",
--- a/public/config.json
View file @b8ac682
+++ b/public/config.json
View file @b8ac682
 {
  "TITLE": "不动产登记系统",
-  "SERVERAPI": "/bdcdj-ssq",
+  "SERVERAPI": "/bdcdj",
-  "ip": "http://192.168.2.38",
  "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0"
 }
\ No newline at end of file
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue
View file @b8ac682
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue
View file @b8ac682
@@ -76,22 +76,22 @@
              <el-input v-model="ruleForm.qlxx.zl"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
            <el-form-item label="土地使用权人：">
              <el-input v-model="ruleForm.fdcq2.tdsyqr"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
            <el-form-item label="独用土地面积：">
              <el-input v-model="ruleForm.fdcq2.dytdmj"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
            <el-form-item label="分摊土地面积：">
              <el-input v-model="ruleForm.fdcq2.fttdmj"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
            <!-- 下拉框 -->
            <el-form-item label="土地性质：" style="margin-bottom:3px">
              <treeselect v-model="ruleForm.fdcq2.jedw" placeholder=""
@@ -99,7 +99,7 @@
                :show-count="true" :options="dictData['A45']" />
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
            <el-form-item label="房地产交易价格：">
              <div style="display:flex">
                <el-input v-model="ruleForm.fdcq2.qjjg" style="width:500%"></el-input>
@@ -164,7 +164,7 @@
              <el-input v-model="ruleForm.fdcq2.zyjzmj"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
            <el-form-item label="分摊建筑面积：">
              <el-input v-model="ruleForm.fdcq2.ftjzmj"></el-input>
            </el-form-item>
@@ -221,8 +221,8 @@
        </div>
        <tdytTable
          :tableData="ruleForm.tdytqxList"
-          @upDateQlrxxList="upDateTdytxxList"
+          @upDateTdytxxList="upDateTdytxxList"
-          :viewtype="$route.query.viewtype" />
+        />
        <div class="slxx_title title-block">
          权利人信息
          <div class="triangle"></div>
@@ -258,7 +258,7 @@
          </el-col>
        </el-row>
        <qlrCommonTable
-          :tableData="ruleForm.qlrList"
+          :tableData="ruleForm.qlrData"
          @upDateQlrxxList="upDateQlrxxList"
          :key="key"
          :viewtype="$route.query.viewtype"
@@ -286,33 +286,18 @@
  </div>
 </template>
 <script>
-  import { mapGetters } from "vuex";
+import { mapGetters } from "vuex";
-  import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
+import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
-  import { init } from "@/api/djbbl.js";
+import { init } from "@/api/djbbl.js";
-  import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
+import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
-  import tdytTable from "@/views/workflow/components/tdytTable";
+import tdytTable from "@/views/workflow/components/tdytTable";
-  // import the component
+export default {
-  import Treeselect from '@riophae/vue-treeselect'
+  components: { qlrCommonTable,tdytTable },
-  // import the styles
-  import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-  export default {
-    components: { qlrCommonTable, tdytTable, Treeselect },
  computed: {
    ...mapGetters(["dictData", "flag"]),
  },
-    data () {
+  data() {
    return {
-        // 键名转换，方法默认是label和children进行树状渲染
-        normalizer (node) { //方法
-          if (node.children == null || node.children == 'null') {
-            delete node.children;
-          }
-          return {
-            id: node.dcode,
-            label: node.dname
-          }
-        },
      //表单是否可操作
      propsParam: this.$attrs,
      ableOperation: true,
@@ -325,47 +310,40 @@
      rules: {},
    };
  },
-    created () {
+  created() {
    this.loadData();
  },
-    mounted () { },
+  mounted() {},
  methods: {
-      loadData () {
+    loadData() {
-        console.log("房地产权", this.propsParam);
+        console.log("房地产权",this.propsParam);
      init(this.propsParam.bsmRepair).then((res) => {
        if (res.code == 200) {
          this.ruleForm = res.result;
+          console.log("this.ruleForm",this.ruleForm);
          this.isShow = true;
-            // this.tableData = res.result;
-            // if (this.tableData.length < datas.columns().emptycolNum) {
-            //   this.emptycolNum =
-            //     datas.columns().emptycolNum - this.tableData.length;
-            // } else {
-            //   this.emptycolNum = 0;
-            // }
        }
      });
    },
      // 更新土地用途信息
-      upDateTdytxxList (val) {
+    upDateTdytxxList(val) {
-        console.log("VAL", val);
+      console.log("VAL",val);
      this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
      this.key++;
    },
    // 更新权利人信息
-      upDateQlrxxList (val) {
+    upDateQlrxxList(val) {
      this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val));
      this.czrOptions = this.ruleForm.qlrList;
      this.key++;
    },
    // 更新义务人信息
-      upDateYwrxxList (val) {
+    upDateYwrxxList(val) {
      this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val));
      this.key++;
    },
-      onSubmit () {
+    onSubmit() {
-        console.log("this.ruleForm大信息", this.ruleForm);
+      console.log("this.ruleForm大信息",this.ruleForm);
      if (this.ruleForm.qlrList.length == 0) {
        this.$message({
          showClose: true,
@@ -421,12 +399,9 @@
      });
    },
  },
-  };
+};
 </script>
 <style scoped lang="scss">
-  @import "~@/styles/public.scss";
+@import "~@/styles/public.scss";
-  @import "~@/styles/slxx/slxx.scss";
+@import "~@/styles/slxx/slxx.scss";
-  /deep/.vue-treeselect__menu-container {
-    transition: 0.3s !important;
-  }
 </style>
--- a/src/views/djbworkflow/djbBook/components/qllxDailog.vue
View file @b8ac682
+++ b/src/views/djbworkflow/djbBook/components/qllxDailog.vue
View file @b8ac682
@@ -11,7 +11,7 @@
    :visible.sync="dialogVisible"
    custom-class="insetDialog"
    append-to-body
-    width="60%"
+    width="50%"
  >
    <!-- <el-radio-group v-model="radio">
      <el-radio-button
@@ -23,7 +23,7 @@
    </el-radio-group> -->
     <el-button class="gettypebutton" v-for="(value, key) in qllxlistdata"
        :key="key"
-        :label="value" @click="clicksss(key)" plain>确定{{value}}</el-button>
+        :label="value" @click="clicksss(key)" plain>{{value}}</el-button>
    <div class="btn">
      <el-button type="primary" @click="handleSubmit">确定</el-button>
      <el-button type="primary" @click="closeDialog">取消</el-button>
--- a/src/views/djbworkflow/mixin/index.js
View file @b8ac682
+++ b/src/views/djbworkflow/mixin/index.js
View file @b8ac682
@@ -79,20 +79,16 @@ export default {
          })
          break;
        case "B2": //材料分屏按钮
-          this.splitScreen = this.splitScreen ? false : true;
-          this.$store.dispatch("app/set1tScreen", this.splitScreen);
+        this.closefp()
-          if (this.splitScreen) {
-            //如果当前选项卡为材料信息内容，递减到上一个选项卡内容
+          // if (this.splitScreen) {
-            if (this.tabName == this.clxxTab.value) {
+          //   //如果当前选项卡为材料信息内容，递减到上一个选项卡内容
-              this.tabName = this.tabList[this.clxxIndex - 1].value;
+          //   if (this.tabName == this.clxxTab.value) {
-              this.getFromRouter(this.tabList[this.clxxIndex - 1].value);
+          //     this.tabName = this.tabList[0].value;
-            }
+          //     this.getFromRouter(this.tabList[0].value);
-            //删除材料信息选项卡数据
+          //   }
-            this.tabList.splice(this.clxxIndex, 1);
+          // }
-          } else {
-            //新增材料信息选项卡数据
-            this.tabList.splice(this.clxxIndex, 0, this.clxxTab);
-          }
          break;
        case "B3": //材料导入
          document.getElementById("cldr").click();
--- a/src/views/djbworkflow/workFrame.vue
View file @b8ac682
+++ b/src/views/djbworkflow/workFrame.vue
View file @b8ac682
@@ -73,7 +73,7 @@
 <script>
 import WorkFlow from "./mixin/index";
 import { getForm } from "./flowform";
-import { getStepFormInfo } from "@/api/fqsq.js"
+import { getStepFormInfo } from "@/api/fqsq.js";
 import NoticeBar from "@/components/NoticeBar/index";
 import ProcessViewer from "./components/processViewer.vue";
 // 引入左侧菜单
@@ -118,12 +118,9 @@ export default {
      //设置表单传递数据
      currentSelectProps: {},
      // 首次拿到的业务信息
-      oneSelectProps:{},
+      oneSelectProps: {},
      //材料信息选择卡索引
-      clxxIndex: "",
+      oneget: true,
-      //材料信息选项卡对象
-      clxxTab: {},
-      oneget:true,
      //页面监听时间
      _beforeUnload_time: "",
      treedata: {},
@@ -132,21 +129,20 @@ export default {
    };
  },
  mounted() {
-// this.getleftMenubl()
+    // this.getleftMenubl()
  },
  methods: {
+    stepForm(qllx) {
-    stepForm (qllx) {
+      this.oneSelectProps.qllx = qllx;
-      this.oneSelectProps.qllx=qllx
+      if (this.$refs.Menu.supplementarylist.length) {
-        if(this.$refs.Menu.supplementarylist.length){
        getStepFormInfo(this.oneSelectProps).then((res) => {
          this.$nextTick(function () {
-             this.tabList=res.result
+            this.tabList = res.result;
-         this.tabName =this.tabList[0].value;
+            this.tabName = this.tabList[0].value;
-         this.getFromRouter(this.tabName)
+            this.getFromRouter(this.tabName);
+          });
        });
-        })
      }
    },
    // 获取右侧菜单
@@ -156,7 +152,7 @@ export default {
    //    })
    // },
    getQllxByBdcdyid() {
-      if(this.currentSelectProps.bdcdyid){
+      if (this.currentSelectProps.bdcdyid) {
        getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
          (res) => {
            if (res.code === 200) {
@@ -166,26 +162,22 @@ export default {
          }
        );
      }
    },
    // 获取右侧选项卡
    getCurrentSelectProps(val) {
-      if(val.bdcdyid){
+      if (val.bdcdyid) {
        this.oneSelectProps = val;
      }
      this.currentSelectProps = val;
      if (this.currentSelectProps.bsmRepair) {
-       this.stepForm (this.currentSelectProps.qllx)
+        this.stepForm(this.currentSelectProps.qllx);
-      } else if(!this.oneget){
+      } else if (!this.oneget) {
        this.getdjblist();
      }
-      if(this.oneget){
+      if (this.oneget) {
-        this.oneget=false
+        this.oneget = false;
-          this.stepForm (this.currentSelectProps.qllx)
+        this.stepForm(this.currentSelectProps.qllx);
      }
    },
    // 获取渲染登记簿列表
    getdjblist() {
@@ -196,10 +188,11 @@ export default {
        if (res.code === 200) {
          this.treedata = loadTreeData(res.result, this.bdcdyh);
          this.$nextTick(function () {
-            this.defaultNode = getNode(
+            this.defaultNode = getNode(this.currentSelectProps.qllx, {
-              this.currentSelectProps.qllx,
+              linShi: 0,
-              { linShi: 0, xianShi: 0, liShi: 0 },
+              xianShi: 0,
-            );
+              liShi: 0,
+            });
            this.tabName = this.defaultNode.id; //data[0].id为默认选中的节点
          });
          let settree = JSON.parse(JSON.stringify(this.treedata));
@@ -221,11 +214,18 @@ export default {
    },
    //切换选项卡内容组件
    getFromRouter(tabname) {
+      console.log("tabname", tabname);
      this.componentTag = getForm(tabname);
    },
+    closefp() {
+      console.log("点击分屏");
+      this.splitScreen = this.splitScreen ? false : true;
+      this.$store.dispatch("app/set1tScreen", this.splitScreen);
+      this.getFromRouter(this.tabList[0].value);
+      this.clxxForm = getForm(this.tabList[1].value);
+    },
    // 增加补录记录
-    addRepairRecord(row,del) {
+    addRepairRecord(row, del) {
      let from = {
        bsmQlxx: "",
        bsmSlsq: this.bsmSlsq,
@@ -235,15 +235,16 @@ export default {
      };
      if (row) {
        from.bsmQlxx = row.bsmQlxx;
-        if(del){
+        if (del) {
          from.operate = del;
-        }else{
+        } else {
          from.operate = row.bsmQlxx ? "U" : "C";
        }
        from.qllx = row.qllx;
      }
-      addRepairRecord(from).then((res) => {
+      addRepairRecord(from)
-        if(res.code=='200'){
+        .then((res) => {
+          if (res.code == "200") {
            this.$refs.qllxlist.dialogVisible = false;
            this.$nextTick(() => {
              this.$refs.Menu.getleftMenubl(res.result);
@@ -252,16 +253,16 @@ export default {
                message: "补录成功!",
              });
            });
-        }else{
+          } else {
-           this.$alert(res.message, '提示', {
+            this.$alert(res.message, "提示", {
-          confirmButtonText: '确定',
+              confirmButtonText: "确定",
-          type: 'warning'
+              type: "warning",
            });
          }
-      }).catch((res) => {
+        })
+        .catch((res) => {
-     console.log("错",res);
+          console.log("错", res);
-        });;
+        });
    },
  },
 };
--- a/src/views/registerBook/qlxxFormData.js
View file @b8ac682
+++ b/src/views/registerBook/qlxxFormData.js
View file @b8ac682
@@ -110,8 +110,8 @@ class data extends filter {
          label: "土地使用期限",
        },
        {
-          prop: "qdjg",
+          prop: "qdjgmc",
-          label: "取得价格(万元)",
+          label: "取得价格",
        },
        {
          prop: "djyy",
@@ -667,7 +667,7 @@ class data extends filter {
          label: "数据类型",
        },
        {
-          prop: "ygdjzl",
+          prop: "ygdjzlmc",
          label: "预告登记种类",
        },
        {
--- a/src/views/workflow/components/dialog/addTdyt.vue deleted 100644 → 0
View file @a091d66
+++ b/src/views/workflow/components/dialog/addTdyt.vue deleted 100644 → 0
View file @a091d66
-<!--
- * @Description:
- * @Autor: renchao
- * @LastEditTime: 2023-05-17 10:39:47
-->
-<template>
-  <dialogBox title="土地用途信息" width="60%" isMain v-model="myValue" :isFullscreen="false" @submitForm="submitForm"
-    @closeDialog="closeDialog" :isButton="showButton">
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="138px">
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="土地用途" prop="tdyt">
-            <el-input v-model="ruleForm.tdyt"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="土地使用权限" prop="syqx">
-            <el-input v-model="ruleForm.syqx"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="土地使用结束时间" prop="jssj">
-            <el-date-picker
-               v-model="ruleForm.jssj"
-               type="daterange"
-               range-separator="至"
-               start-placeholder="开始日期"
-               end-placeholder="结束日期"
-              value-format="yyyy-MM-dd">>
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-          <el-col :span="12">
-          <el-form-item label="土地使用起止时间" prop="qzsj">
-              <el-date-picker
-               v-model="ruleForm.qzsj"
-               type="daterange"
-               range-separator="至"
-               start-placeholder="开始日期"
-               end-placeholder="结束日期"
-              value-format="yyyy-MM-dd">>
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-  </dialogBox>
-</template>z x  addTdyt
-<script>
-  import { mapGetters } from "vuex";
-  export default {
-    props: {
-      value: { type: Boolean, default: false },
-      details: { type: Object, default: {} },
-      showButton: { type: Boolean, default: false }
-    },
-    data () {
-      return {
-        myValue: this.value,
-        ruleForm: {
-             tdyt:"",
-             syqx:"",
-             jssj:"",
-             qzsj:""
-        },
-        rules: {
-          tdyt: [{ required: true, message: "土地用途", trigger: "blur" }],
-          syqx: [{ required: true, message: "土地使用权限", trigger: "blur" }],
-          jssj: [{ required: true, message: "土地使用结束时间", trigger: "blur" }],
-          qzsj: [{ required: true, message: "土地使用起止时间", trigger: "blur" }],
-        },
-      };
-    },
-    watch: {
-      value (val) {
-        console.log("val",val);
-        this.myValue = _.cloneDeep(val);
-      },
-      details: {
-        handler: function (val, oldVal) {
-           console.log("val2",val);
-          this.ruleForm = val;
-        },
-        deep: true,
-      },
-    },
-    methods: {
-      closeDialog () {
-        this.$emit("input", false);
-        this.$refs["ruleForm"].resetFields();
-      },
-      submitForm () {
-        console.log("this.ruleForm",this.ruleForm);
-        this.$refs.ruleForm.validate((valid) => {
-          if (valid) {
-            this.$emit("input", false);
-            this.$emit("updateDetail", _.cloneDeep(this.ruleForm));
-          } else {
-            return false;
-          }
-        });
-      },
-    },
-  };
-</script>
-<style scoped lang="scss">
-  @import "~@/styles/dialogBoxheader.scss";
-  .submit-button {
-    text-align: center;
-    height: 52px;
-    padding-top: 10px;
-    background-color: #fff;
-  }
-</style>
--- a/src/views/workflow/components/tdytTable.vue
View file @b8ac682
+++ b/src/views/workflow/components/tdytTable.vue
View file @b8ac682
@@ -5,20 +5,20 @@
 -->
 <template>
  <div>
-    <lb-table :column="InformationTable" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150"
+    <lb-table
-      :data="tableDataList">
+      :column="InformationTable"
+      :pagination="false"
+      :key="key"
+      :heightNumSetting="true"
+      :minHeight="150"
+      :data="tableDataList"
+    >
    </lb-table>
-    <addTdyt v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" />
  </div>
 </template>
 <script>
-  import { mapGetters } from 'vuex'
+import { mapGetters } from "vuex";
-  import { getIdCardInfo } from '@/utils/operation.js'
+export default {
-  import addTdyt from './dialog/addTdyt.vue'
-  export default {
-    components: {
-      addTdyt
-    },
  computed: {
    ...mapGetters(["dictData"]),
  },
@@ -26,59 +26,85 @@
    tableData: {
      type: Array,
      default: function () {
-          return []
+        return [];
-        }
      },
    },
-    data () {
+  },
+  data() {
    return {
      key: 0,
-        dataIndex: 0,
+      newdata: {
-        dialog: false,
+        yt: "",
-        isaddupdate: false,
+        qssj: "",
-        showButton: this.$route.query.viewtype ? false : true,
+        jssj: "",
-        details: {},
+        syqx: "",
+      },
      tableDataList: [],
      InformationTable: [
        {
-            width: '50',
+          width: "50",
          renderHeader: (h, scope) => {
-              return <div> {
+            return (
-                this.$route.query.viewtype == 1 ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.addClick() }}></i>
+              <div>
-              }
+                {" "}
+                {this.$route.query.viewtype == 1 ? (
+                  "序号"
+                ) : (
+                  <i
+                    class="el-icon-plus pointer"
+                    onClick={() => {
+                      this.addClick();
+                    }}
+                  ></i>
+                )}
              </div>
+            );
          },
          render: (h, scope) => {
            return (
              <div>
-                  {
+                {this.$route.query.viewtype == 1 ? (
-                    this.$route.query.viewtype == 1 ? <span>{scope.$index + 1}</span> :
+                  <span>{scope.$index + 1}</span>
-                      <i class="el-icon-minus pointer" onClick={() => { this.deleClick(scope.$index, scope.row) }}></i>
+                ) : (
-                  }
+                  <i
+                    class="el-icon-minus pointer"
+                    onClick={() => {
+                      this.deleClick(scope.$index, scope.row);
+                    }}
+                  ></i>
+                )}
              </div>
-              )
+            );
-            }
+          },
        },
        {
-            label: '土地用途',
+          label: "土地用途",
-            align: 'center',
+          align: "center",
          render: (h, scope) => {
            return (
-              <el-select value={scope.row.yt}
+              <el-select
-                onChange={(val) => { scope.row.yt = val }} clearable>
+                value={scope.row.yt}
-                {
+                onChange={(val) => {
-                  this.dictData['tdyt'].map(option => {
+                  scope.row.yt = val;
+                }}
+                clearable
+                onblur={() => {
+                  this.addrow(scope);
+                }}
+              >
+                {this.dictData["tdyt"].map((option) => {
                  return (
-                      <el-option label={option.dname} value={option.dcode}></el-option>
+                    <el-option
-                    )
+                      label={option.dname}
-                  })
+                      value={option.dcode}
-                }
+                    ></el-option>
+                  );
+                })}
              </el-select>
-            )
+            );
-           }
+          },
        },
        {
-            prop: "sqrmc",
          label: "土地使用起始时间",
          render: (h, scope) => {
            return (
@@ -86,12 +112,15 @@
                v-model={scope.row.qssj}
                type="date"
                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+                onblur={() => {
+                  this.addrow(scope.row);
+                }}
              ></el-date-picker>
            );
-            }
+          },
        },
        {
-            prop: "zjzl",
          label: "土地使用结束时间",
          render: (h, scope) => {
            return (
@@ -99,120 +128,80 @@
                v-model={scope.row.jssj}
                type="date"
                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+                onblur={() => {
+                  this.addrow(scope.row);
+                }}
              ></el-date-picker>
            );
-            }
+          },
        },
        {
-            prop: "zjh",
          label: "土地使用期限",
          render: (h, scope) => {
-               return <el-input v-model={scope.row.syqx} ></el-input>
+            return (
-            }
+              <el-input
-          }
+                v-model={scope.row.syqx}
+                onblur={() => {
+                  this.addrow(scope.row);
+                }}
+              ></el-input>
+            );
+          },
+        },
      ],
-      }
+    };
  },
  watch: {
    tableData: {
      handler: function (val, oldVal) {
-           console.log("什么事件111",val);
+        console.log("什么事件111", val);
-          let that = this
+        let that = this;
        this.$nextTick(() => {
          if (val.length == 0 || !val) {
-              that.tableDataList = _.cloneDeep([{
+            that.tableDataList = _.cloneDeep([
-                sqrmc: '',
+              {
-                dlrzjlx: '',
+                yt: "",
-                dlrzjh: '',
+                qssj: "",
-                fr: ''
+                jssj: "",
-              }])
+                syqx: "",
+              },
+            ]);
          } else {
-              that.tableDataList = _.cloneDeep(val)
+            that.tableDataList = _.cloneDeep(val);
          }
-          })
+        });
      },
      immediate: true,
-        deep: true
+      deep: true,
-      },
+    },
-      // gyfs: {
-      //   handler (newVal, oldValue) {
-      //     console.log("什么事件222",newVal);
-      //     let dataList = _.cloneDeep(this.InformationTable)
-      //     let dataList = _.cloneDeep(this.InformationTable)
-      //     if (newVal == 0) {
-      //       // this.column = _.cloneDeep(dataList).slice(1, dataList.length)
-      //       this.column = _.cloneDeep(dataList)
-      //     } else if ((newVal == '1' || newVal == '3')) {
-      //       this.column = dataList
-      //     } else {
-      //       this.column = _.cloneDeep(dataList)
-      //     }
-      //   },
-      //   immediate: true
-      // }
  },
  methods: {
-    //  新增提交事件
+    // 修改事件
-      handleupdateDetail (value) {
+    addrow() {
-        console.log("什么事件33",this.tableData);
+      this.$emit("upDateTdytxxList", this.tableDataList);
-        if (this.isaddupdate) {
-          if (!_.isEqual(value, this.tableData)) {
-            this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
-            this.$emit('upDateQlrxxList', this.tableDataList)
-          }
-        } else {
-          if (!_.isEqual(value, this.tableData)) {
-            this.tableDataList[this.dataIndex] = _.cloneDeep(value);
-            this.$emit('upDateQlrxxList', this.tableDataList)
-          }
-        }
-        this.key++
    },
    // 新增
-      addClick () {
+    addClick() {
-        if (this.gyfs == '0' && this.tableDataList.length > 0) {
+      this.tableDataList[this.tableDataList.length] = _.cloneDeep(this.newdata);
-          this.$message.warning("1")
+      this.$emit("upDateTdytxxList", this.tableDataList);
-        } else {
-          this.dialog = true
-          this.isaddupdate = true
-        }
    },
    // 删除
-      deleClick (index, row) {
+    deleClick(index, row) {
-        this.$confirm('确定要删除吗, 是否继续?', '提示', {
+      console.log("删除");
-          confirmButtonText: '确定',
+      this.$confirm("确定要删除吗, 是否继续?", "提示", {
-          cancelButtonText: '取消',
+        confirmButtonText: "确定",
-          type: 'warning'
+        cancelButtonText: "取消",
-        }).then(() => {
+        type: "warning",
-          this.tableData.splice(index, 1)
+      })
-        }).catch(() => {
+        .then(() => {
-        });
+          this.tableData.splice(index, 1);
+        })
+        .catch(() => {});
    },
-      // 修改
+  },
-      editClick (index, row) {
+};
-        //   popupDialog("申请人信息", "workflow/components/addQlr", {
-        //     showButton: this.$route.query.viewtype ? false : true,
-        //   dataIndex :index,
-        //  details :row,/[^\d]/g
-        //  isaddupdate :false
-        // });
-        this.dataIndex = index
-        this.dialog = true
-        this.details = row
-        this.isaddupdate = false
-      },
-      queryViewClick (index, row) {
-        //   popupDialog("申请人信息", "workflow/components/addQlr", {
-        //     showButton: this.$route.query.viewtype ? false : true,
-        //   details: row,
-        // });
-        this.dialog = true
-        this.details = row
-      }
-    }
-  }
 </script>
 <style scoped lang="scss">
 .el-input {
--- a/src/views/ywbl/slsqxx/jsydsyq/slxx.vue
View file @b8ac682
+++ b/src/views/ywbl/slsqxx/jsydsyq/slxx.vue
View file @b8ac682
@@ -16,34 +16,34 @@
        <el-row :gutter="10">
          <el-col :span="8">
            <el-form-item label="业务号：">
-              <el-input disabled v-model="ruleForm.slsq.ywh"></el-input>
+              <el-input disabled v-model="ruleForm.flow.ywh"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="受理人员：">
-              <el-input disabled v-model="ruleForm.slsq.slry"></el-input>
+              <el-input disabled v-model="ruleForm.slsq1.slry"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="受理时间：">
-              <el-input disabled v-model="ruleForm.slsq.slsj"></el-input>
+              <el-input disabled v-model="ruleForm.slsq1.slsj"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="10">
          <el-col :span="8">
            <el-form-item label="权利类型：">
-              <el-input disabled v-model="ruleForm.slsq.qllxmc"></el-input>
+              <el-input disabled v-model="ruleForm.sldy.qllxmc"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="登记类型：">
-              <el-input disabled v-model="ruleForm.slsq.djlxmc"></el-input>
+              <el-input disabled v-model="ruleForm.sldy.djlxmc"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="登记情形：">
-              <el-input disabled v-model="ruleForm.slsq.djqxmc"></el-input>
+              <el-input disabled v-model="ruleForm.slsq1.djqxmc"></el-input>
            </el-form-item>
          </el-col>
        </el-row>