--no commit message

@@ -13,7 +13,7 @@
       ref="ruleForm"
       :label-position="flag ? 'top' : ''"
       :inline="flag"
-      label-width="120px"
+      label-width="127px"
     >
       <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
@@ -93,32 +93,24 @@
             </el-form-item>
           </el-col>
            <el-col :span="8">
-            <el-form-item label="土地用途：">
-              <el-input v-model="ruleForm.qlxx.ywh"></el-input>
-            </el-form-item>
-          </el-col>
-           <el-col :span="8">
-            <el-form-item label="土地使用起始时间：">
-              <el-input v-model="ruleForm.qlxx.ywh"></el-input>
-            </el-form-item>
-          </el-col>
-           <el-col :span="8">
-            <el-form-item label="土地使用结束时间：">
-              <el-input v-model="ruleForm.qlxx.ywh"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="土地使用期限：">
-              <el-input v-model="ruleForm.qlxx.ywh"></el-input>
+           <!-- 下拉框 -->
+            <el-form-item label="土地性质：">
+                 <el-select v-model="ruleForm.fdcq2.jedw">
+                  <el-option v-for="item in dictData['A45']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                  </el-option>
+                </el-select>
             </el-form-item>
           </el-col>
            <el-col :span="8">
+
             <el-form-item label="房地产交易价格：">
-              <el-input v-model="ruleForm.fdcq2.qjjg"></el-input>
-               <el-select v-model="ruleForm.fdcq2.jedw">
+               <div style="display:flex">
+               <el-input v-model="ruleForm.fdcq2.qjjg" style="width:500%"></el-input>
+                <el-select v-model="ruleForm.fdcq2.jedw">
                   <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                   </el-option>
                 </el-select>
+              </div>
             </el-form-item>
           </el-col>
            <el-col :span="8">
@@ -231,10 +223,9 @@
           <div class="triangle"></div>
         </div>
          <tdytTable
-          :tableData="ruleForm.tdxxList"
-          @upDateQlrxxList="upDateQlrxxList"
+          :tableData="ruleForm.tdytqxList"
+          @upDateQlrxxList="upDateTdytxxList"
           :viewtype="$route.query.viewtype"
-          :gyfs="ruleForm.qlxx.gyfs"
         />
         <div class="slxx_title title-block">
           权利人信息
@@ -348,6 +339,12 @@ export default {
         }
       });
     },
+      // 更新土地用途信息
+    upDateTdytxxList(val) {
+      console.log("VAL",val);
+      this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
+      this.key++;
+    },
     // 更新权利人信息
     upDateQlrxxList(val) {
       this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val));
@@ -360,6 +357,7 @@ export default {
       this.key++;
     },
     onSubmit() {
+      console.log("this.ruleForm大信息",this.ruleForm);
       if (this.ruleForm.qlrList.length == 0) {
         this.$message({
           showClose: true,

+<!--
+ * @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>

@@ -5,19 +5,19 @@
 -->
 <template>
   <div>
-    <lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150"
+    <lb-table :column="InformationTable" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150"
       :data="tableDataList">
     </lb-table>
-    <addQlr v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" />
+    <addTdyt v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" />
   </div>
 </template>
 <script>
   import { mapGetters } from 'vuex'
   import { getIdCardInfo } from '@/utils/operation.js'
-  import addQlr from './dialog/addQlr.vue'
+  import addTdyt from './dialog/addTdyt.vue'
   export default {
     components: {
-      addQlr
+      addTdyt
     },
     computed: {
       ...mapGetters(["dictData"]),
@@ -29,10 +29,6 @@
           return []
         }
       },
-      gyfs: {
-        type: String,
-        default: '1'
-      }
     },
     data () {
       return {
@@ -63,41 +59,64 @@
               )
             }
           },
-          {
+           {
             label: '土地用途',
             align: 'center',
-            render: (h, scope) => {
-               return <el-input v-model={scope.row.zjzl} ></el-input>
-            }
-          },
+             render: (h, scope) => {
+            return (
+              <el-select value={scope.row.yt}
+                onChange={(val) => { scope.row.yt = val }} clearable>
+                {
+                  this.dictData['tdyt'].map(option => {
+                    return (
+                      <el-option label={option.dname} value={option.dcode}></el-option>
+                    )
+                  })
+                }
+              </el-select>
+            )
+           }
+           },
           {
             prop: "sqrmc",
             label: "土地使用起始时间",
              render: (h, scope) => {
-               return <el-input v-model={scope.row.zjzl} ></el-input>
+            return (
+              <el-date-picker
+                v-model={scope.row.qssj}
+                type="date"
+                placeholder="选择日期"
+              ></el-date-picker>
+            );
             }
           },
           {
             prop: "zjzl",
             label: "土地使用结束时间",
-             render: (h, scope) => {
-               return <el-input v-model={scope.row.zjzl} ></el-input>
+              render: (h, scope) => {
+            return (
+              <el-date-picker
+                v-model={scope.row.jssj}
+                type="date"
+                placeholder="选择日期"
+              ></el-date-picker>
+            );
             }
           },
           {
             prop: "zjh",
             label: "土地使用期限",
              render: (h, scope) => {
-               return <el-input v-model={scope.row.zjzl} ></el-input>
+               return <el-input v-model={scope.row.syqx} ></el-input>
             }
           }
         ],
-        column: []
       }
     },
     watch: {
       tableData: {
         handler: function (val, oldVal) {
+           console.log("什么事件111",val);
           let that = this
           this.$nextTick(() => {
             if (val.length == 0 || !val) {
@@ -115,29 +134,28 @@
         immediate: true,
         deep: true
       },
-      gyfs: {
-        handler (newVal, oldValue) {
-          let dataList = _.cloneDeep(this.InformationTable)
-          if (newVal == 0) {
-            // this.column = _.cloneDeep(dataList).slice(1, dataList.length)
-            this.column = _.cloneDeep(dataList)
+      // 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)
-            this.column.splice(
-              2, 0, {
-              prop: "fs",
-              label: "份数"
-            })
-          }
-        },
-        immediate: true
-      }
+      //     } else if ((newVal == '1' || newVal == '3')) {
+      //       this.column = dataList
+      //     } else {
+      //       this.column = _.cloneDeep(dataList)
+      //     }
+      //   },
+      //   immediate: true
+      // }
     },
     methods: {
+    //  新增提交事件
       handleupdateDetail (value) {
+        console.log("什么事件33",this.tableData);
         if (this.isaddupdate) {
           if (!_.isEqual(value, this.tableData)) {
             this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
@@ -154,7 +172,7 @@
       // 新增
       addClick () {
         if (this.gyfs == '0' && this.tableDataList.length > 0) {
-          this.$message.warning("当前共有方式为单独所有，无法添加多个权利人")
+          this.$message.warning("1")
         } else {
           this.dialog = true
           this.isaddupdate = true
@@ -172,36 +190,12 @@
         }).catch(() => {
         });
       },
-
-      // 身份证读取
-      readClick (row) {
-        getIdCardInfo().then(res => {
-          if (res.data.code == 0) {
-            let data = res.data.IDCardInfo
-            row.sqrmc = data.name
-            row.zjzl = '1'
-            row.zjh = data.cardID
-            row.xb = data.sexCode
-            row.txdz = data.address
-            row.fzjg = data.issueOrgan
-            this.$message({
-              message: '读取成功！',
-              type: 'success'
-            })
-          } else {
-            this.$message({
-              message: res.data.message,
-              type: 'warning'
-            })
-          }
-        })
-      },
       // 修改
       editClick (index, row) {
         //   popupDialog("申请人信息", "workflow/components/addQlr", {
         //     showButton: this.$route.query.viewtype ? false : true,
         //   dataIndex :index,
-        //  details :row,
+        //  details :row,/[^\d]/g
         //  isaddupdate :false
         // });
         this.dataIndex = index