--no commit message

@@ -15,7 +15,8 @@
       :label-position="flag ? 'top' : ''"
       :inline="flag"
       label-width="145px"
-      inline-message>
+      inline-message
+    >
       <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           补录信息
@@ -50,18 +51,22 @@
                 :table-width="550"
                 :tableData="ztQlxxList"
                 :props="props"
-                @change="ztQlxxchange">
+                @change="ztQlxxchange"
+              >
                 <el-table-column
                   prop="qllxmc"
                   width="130"
-                  label="权利类型"></el-table-column>
+                  label="权利类型"
+                ></el-table-column>
                 <el-table-column
                   prop="bdcqzh"
                   width="160"
-                  label="不动产权证书"></el-table-column>
+                  label="不动产权证书"
+                ></el-table-column>
                 <el-table-column
                   prop="qlrmc"
-                  label="被执行人"></el-table-column>
+                  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>
@@ -76,15 +81,18 @@
                 :table-width="550"
                 :tableData="ssQlxxList"
                 :props="props"
-                @change="ssQlxxchange">
+                @change="ssQlxxchange"
+              >
                 <el-table-column
                   prop="qllxmc"
                   width="130"
-                  label="权利类型"></el-table-column>
+                  label="权利类型"
+                ></el-table-column>
                 <el-table-column
                   prop="bdcqzh"
                   width="160"
-                  label="不动产权证书"></el-table-column>
+                  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>
@@ -178,7 +186,8 @@
                   v-for="item in sfbxflist"
                   :key="item.dcode"
                   :label="item.dname"
-                  :value="item.dcode"></el-option>
+                  :value="item.dcode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -194,12 +203,17 @@
                   v-for="item in qsztlist"
                   :key="item.dcode"
                   :label="item.dname"
-                  :value="item.dcode"></el-option>
+                  :value="item.dcode"
+                ></el-option>
               </el-select>
             </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>
@@ -215,7 +229,8 @@
                   v-for="item in dictData['A32']"
                   :key="item.dcode"
                   :label="item.dname"
-                  :value="item.dcode"></el-option>
+                  :value="item.dcode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -245,24 +260,47 @@
             </el-form-item>
           </el-col>
           <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 :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-input v-model="ruleForm.qlxx.djsj"></el-input>
+            <el-form-item
+              label="登记时间："
+              prop="qlxx.djsj"
+              :rules="rules.djsjrules"
+            >
+              <el-date-picker
+                v-model="ruleForm.qlxx.djsj"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -311,228 +349,227 @@
   </div>
 </template>
 <script>
-  import { mapGetters } from "vuex";
-  import { init, getSsQlxx, getZtQlxx, save } from "@/api/djbbl.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, selectTable },
-    computed: {
-      ...mapGetters(["dictData", "flag"]),
-    },
-    data () {
-      return {
-        //表单是否可操作
-        props: {
-          label: "bdcqzh",
-          value: "bdcdyid",
+import { mapGetters } from "vuex";
+import { init, getSsQlxx, getZtQlxx, save } from "@/api/djbbl.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, selectTable },
+  computed: {
+    ...mapGetters(["dictData", "flag"]),
+  },
+  data() {
+    return {
+      //表单是否可操作
+      props: {
+        label: "bdcqzh",
+        value: "bdcdyid",
+      },
+      propsParam: this.$attrs,
+      key: 0,
+      isShow: false,
+      ssqlxxshow: true,
+      disabled: true,
+      czrOptions: [],
+      ruleForm: {},
+      rules: {},
+      // 登记类型
+      djlxlist: [
+        {
+          dcode: "100",
+          dname: "首次登记",
+        },
+        {
+          dcode: "200",
+          dname: "转移登记",
+        },
+        {
+          dcode: "300",
+          dname: "变更登记",
+        },
+        {
+          dcode: "500",
+          dname: "更正登记",
         },
-        propsParam: this.$attrs,
-        key: 0,
-        isShow: false,
-        ssqlxxshow: true,
-        disabled: true,
-        czrOptions: [],
-        ruleForm: {},
-        rules: {},
-        // 登记类型
-        djlxlist: [
-          {
-            dcode: "100",
-            dname: "首次登记",
-          },
-          {
-            dcode: "200",
-            dname: "转移登记",
-          },
-          {
-            dcode: "300",
-            dname: "变更登记",
-          },
-          {
-            dcode: "500",
-            dname: "更正登记",
-          },
 
-          {
-            dcode: "901",
-            dname: "补证",
-          },
-          {
-            dcode: "902",
-            dname: "换证",
-          },
-        ],
+        {
+          dcode: "901",
+          dname: "补证",
+        },
+        {
+          dcode: "902",
+          dname: "换证",
+        },
+      ],
 
-        // 权属状态
-        qsztlist: [
-          {
-            dcode: "1",
-            dname: "现势",
-          },
-          {
-            dcode: "2",
-            dname: "历史",
-          },
-        ],
-        // 是否被续封
-        sfbxflist: [
-          {
-            dcode: "0",
-            dname: "否",
-          },
-          {
-            dcode: "1",
-            dname: "是",
-          },
-        ],
-        //传递参数\
+      // 权属状态
+      qsztlist: [
+        {
+          dcode: "1",
+          dname: "现势",
+        },
+        {
+          dcode: "2",
+          dname: "历史",
+        },
+      ],
+      // 是否被续封
+      sfbxflist: [
+        {
+          dcode: "0",
+          dname: "否",
+        },
+        {
+          dcode: "1",
+          dname: "是",
+        },
+      ],
+      //传递参数\
 
-        ssQlxxList: [],
-        ztQlxxList: [],
-           rules: {
-          bdcqzhrules:[
-            { required: true, message: "不动产权证号：", trigger: "change" },
-          ],
+      ssQlxxList: [],
+      ztQlxxList: [],
+      rules: {
+        bdcqzhrules: [
+          { required: true, message: "不动产权证号：", trigger: "change" },
+        ],
         qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
         djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
         dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
         djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
       },
-
-      };
+    };
+  },
+  created() {
+    this.loadData();
+  },
+  mounted() {},
+  methods: {
+    ztQlxxchange(val) {
+      this.ruleForm.ztQlxx = val;
     },
-    created () {
-      this.loadData();
+    ssQlxxchange(val) {
+      this.ruleForm.ssQlxx = val;
+      this.ruleForm.qlxx.ssywh = val.ssywh;
     },
-    mounted () { },
-    methods: {
-      ztQlxxchange (val) {
-        this.ruleForm.ztQlxx = val;
-      },
-      ssQlxxchange (val) {
-        this.ruleForm.ssQlxx = val;
-        this.ruleForm.qlxx.ssywh = val.ssywh;
-      },
-      djlxchange (val) {
-        if (val == null || val == 100) {
-          this.ssqlxxshow = false;
-        } else {
-          this.ssqlxxshow = true;
-        }
-      },
-      loadData () {
-        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;
-            if (djlx == null || djlx == 100) {
-              this.ssqlxxshow = false;
-            }
-          }
-        });
-        //获取主体信息
-        getSsQlxx({
-          bdcdyid: this.propsParam.bdcdyid,
-          qllx: this.propsParam.qllx,
-        }).then((res) => {
-          if (res.code == 200) {
-            this.ssQlxxList = res.result;
-          }
-        });
-        //获取上手信息
-        getZtQlxx({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
-          if (res.code == 200) {
-            this.ztQlxxList = res.result;
+    djlxchange(val) {
+      if (val == null || val == 100) {
+        this.ssqlxxshow = false;
+      } else {
+        this.ssqlxxshow = true;
+      }
+    },
+    loadData() {
+      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;
+          if (djlx == null || djlx == 100) {
+            this.ssqlxxshow = false;
           }
-        });
-      },
-      // 更新土地用途信息
-      upDateTdytxxList (val) {
-        this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
-        this.key++;
-      },
-      // 更新权利人信息
-      upDateQlrxxList (val) {
-        this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
-        this.czrOptions = this.ruleForm.qlrData;
-        this.key++;
-      },
-      // 更新义务人信息
-      upDateYwrxxList (val) {
-        this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
-        this.key++;
-      },
-      onSubmit () {
-        this.$refs.ruleForm.validate((valid) => {
-          console.log("valid", valid);
-          if (valid) {
-            if (this.ruleForm.qlrData.length == 0) {
+        }
+      });
+      //获取主体信息
+      getSsQlxx({
+        bdcdyid: this.propsParam.bdcdyid,
+        qllx: this.propsParam.qllx,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.ssQlxxList = res.result;
+        }
+      });
+      //获取上手信息
+      getZtQlxx({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
+        if (res.code == 200) {
+          this.ztQlxxList = res.result;
+        }
+      });
+    },
+    // 更新土地用途信息
+    upDateTdytxxList(val) {
+      this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
+      this.key++;
+    },
+    // 更新权利人信息
+    upDateQlrxxList(val) {
+      this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
+      this.czrOptions = this.ruleForm.qlrData;
+      this.key++;
+    },
+    // 更新义务人信息
+    upDateYwrxxList(val) {
+      this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
+      this.key++;
+    },
+    onSubmit() {
+      this.$refs.ruleForm.validate((valid) => {
+        console.log("valid", valid);
+        if (valid) {
+          // if (this.ruleForm.qlrData.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({
+          //       showClose: true,
+          //       message: "共有方式：单独所有，权利人只能是一个人",
+          //       type: "error",
+          //     });
+          //     return false;
+          //   }
+          //   this.ruleForm.qlrData[0].sfczr = "1";
+          // }
+          // if (this.ruleForm.qlxx.gyfs == "1") {
+          //   //是否分别持证
+          //   if (this.ruleForm.qlxx.sqfbcz == "1") {
+          //     //是
+          //     this.ruleForm.qlrData.forEach((item, index) => {
+          //       item.sfczr = "1";
+          //     });
+          //   } else {
+          //     this.ruleForm.qlrData.forEach((item, index) => {
+          //       if (item.zjh == this.ruleForm.czr) {
+          //         item.sfczr = "1";
+          //       } else {
+          //         item.sfczr = "0";
+          //       }
+          //     });
+          //   }
+          // }
+          save(this.ruleForm).then((res) => {
+            if (res.code === 200) {
+              this.$message({
+                showClose: true,
+                message: "保存成功！",
+                type: "success",
+              });
+              this.$store.dispatch("user/refreshPage", true);
+            } else {
               this.$message({
                 showClose: true,
-                message: "请确认权利人信息",
+                message: res.message,
                 type: "error",
               });
-              return false;
-            }
-
-            if (this.ruleForm.qlxx.gyfs == "0") {
-              if (this.ruleForm.qlrData.length > 1) {
-                this.$message({
-                  showClose: true,
-                  message: "共有方式：单独所有，权利人只能是一个人",
-                  type: "error",
-                });
-                return false;
-              }
-              this.ruleForm.qlrData[0].sfczr = "1";
             }
-            if (this.ruleForm.qlxx.gyfs == "1") {
-              //是否分别持证
-              if (this.ruleForm.qlxx.sqfbcz == "1") {
-                //是
-                this.ruleForm.qlrData.forEach((item, index) => {
-                  item.sfczr = "1";
-                });
-              } else {
-                this.ruleForm.qlrData.forEach((item, index) => {
-                  if (item.zjh == this.ruleForm.czr) {
-                    item.sfczr = "1";
-                  } else {
-                    item.sfczr = "0";
-                  }
-                });
-              }
-            }
-            save(this.ruleForm).then((res) => {
-              if (res.code === 200) {
-                this.$message({
-                  showClose: true,
-                  message: "保存成功！",
-                  type: "success",
-                });
-                this.$store.dispatch("user/refreshPage", true);
-              } else {
-                this.$message({
-                  showClose: true,
-                  message: res.message,
-                  type: "error",
-                });
-              }
-            });
-          } else {
-            return false;
-          }
-        });
-      },
+          });
+        } else {
+          return false;
+        }
+      });
     },
-  };
+  },
+};
 </script>
 <style scoped lang="scss">
-  @import "~@/styles/public.scss";
-  @import "~@/styles/slxx/slxx.scss";
+@import "~@/styles/public.scss";
+@import "~@/styles/slxx/slxx.scss";
 </style>

@@ -373,8 +373,8 @@
               v-model="ruleForm.qlxx.djsj"
               type="date"
               placeholder="选择日期"
-              value-format="yyyy/MM/dd HH:mm:ss"
-              format="yyyy/MM/dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>

@@ -110,7 +110,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
-              <el-input v-model="ruleForm.qlxx.djsj"></el-input>
+               <el-date-picker
+                v-model="ruleForm.qlxx.djsj"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">

@@ -240,7 +240,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
-              <el-input v-model="ruleForm.qlxx.djsj"></el-input>
+              <el-date-picker
+                v-model="ruleForm.qlxx.djsj"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>

@@ -189,7 +189,14 @@
               prop="qlxx.djsj"
               :rules="rules.djsjrules"
             >
-              <el-input v-model="ruleForm.qlxx.djsj"></el-input>
+             <el-date-picker
+                v-model="ruleForm.qlxx.djsj"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>

@@ -111,7 +111,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
-              <el-input v-model="ruleForm.qlxx.djsj"></el-input>
+              <el-date-picker
+                v-model="ruleForm.qlxx.djsj"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">

@@ -110,7 +110,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
-              <el-input v-model="ruleForm.qlxx.djsj"></el-input>
+               <el-date-picker
+                v-model="ruleForm.qlxx.djsj"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -154,7 +161,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="注销异议登记时间">
-              <el-input v-model="ruleForm.yydj.zxyydjsj"></el-input>
+               <el-date-picker
+                v-model="ruleForm.yydj.zxyydjsj"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">