Merge branch 'dev'

@@ -531,7 +531,7 @@
             // 恢复原始字体设置
             context.font = originalFont;
           } else {
-            context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 170, 56);
+            context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 755, 125);
           }
 
           context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 960, 123);

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-24 17:29:20
+ * @LastEditTime: 2024-01-30 16:29:37
 -->
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;">
@@ -444,6 +444,7 @@
           }
           context.fillText(this.bdcqz.sjjc ? this.bdcqz.sjjc : '', 620, 125);
           context.fillText(this.bdcqz.djnd ? this.bdcqz.djnd : '', 665, 125);
+          console.log(getByteLen(this.bdcqz.sxqc));
           if (getByteLen(this.bdcqz.sxqc) > 14) {
             const originalFont = context.font;
             // 设置新的字体大小
@@ -453,7 +454,7 @@
             // 恢复原始字体设置
             context.font = originalFont;
           } else {
-            context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 170, 56);
+            context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 755, 125);
           }
 
           context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 960, 123);

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2024-01-30 15:17:03
+ * @LastEditTime: 2024-01-30 16:31:12
 -->
 <template>
   <div class="slxx">
@@ -502,8 +502,12 @@
         propsParam: this.$attrs,
         //表单是否可操作
         viewEdit: true,
-        rules: {},
-      };
+        rules: {
+          'fdcq2.djyy': [
+            { required: true, message: '请输入登记原因', trigger: 'blur' }
+          ]
+        }
+      }
     },
     methods: {
       /**
@@ -619,26 +623,37 @@
             });
           }
         }
-        this.$store.dispatch("user/refreshPage", false);
-        saveData(this.ruleForm).then((res) => {
+        this.$refs['ruleForm'].validate((valid) => {
+          if (valid) {
+            that.$store.dispatch("user/refreshPage", false);
+            saveData(that.ruleForm).then((res) => {
               if (res.code === 200) {
-            this.$message({
+                that.$message({
                   showClose: true,
                   message: "保存成功！",
                   type: "success",
                 });
-            this.$store.dispatch("user/refreshPage", true);
+                that.$store.dispatch("user/refreshPage", true);
               } else {
-            this.$message({
+                that.$message({
                   showClose: true,
                   message: res.message,
-              type: "error",
+                  type: "error"
+                })
+              }
+            })
+          } else {
+            that.$message({
+              showClose: true,
+              message: "请输入登记原因",
+              type: "error"
             })
+            return false
           }
         })
       }
-    },
-  };
+    }
+  }
 </script>
 <style scoped lang="scss">
   @import "~@/styles/public.scss";

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-11-15 15:47:37
+ * @LastEditTime: 2024-01-30 16:07:53
 -->
 <template>
   <div class="slxx">
@@ -245,7 +245,7 @@
         </div>
         <el-row :gutter="10">
           <el-col>
-            <el-form-item v-if="ruleForm.fdcq2" label="登记原因：" prop="djyy">
+            <el-form-item v-if="ruleForm.fdcq2" label="登记原因：" prop="fdcq2.djyy">
               <el-input
                 class="textArea"
                 type="textarea"
@@ -378,8 +378,12 @@
         },
         //传递参数
         propsParam: {},
-        rules: {},
-      };
+        rules: {
+          'fdcq2.djyy': [
+            { required: true, message: '请输入登记原因', trigger: 'blur' }
+          ]
+        }
+      }
     },
     methods: {
       /**
@@ -511,22 +515,35 @@
             })
           }
         }
-        saveData(this.ruleForm).then((res) => {
+        this.$refs['ruleForm'].validate((valid) => {
+          if (valid) {
+            that.$store.dispatch("user/refreshPage", false);
+            saveData(that.ruleForm).then((res) => {
               if (res.code === 200) {
-            this.$message({
+                that.$message({
                   showClose: true,
                   message: "保存成功！",
                   type: "success",
                 });
-            this.$store.dispatch("user/refreshPage", true);
+                that.$store.dispatch("user/refreshPage", true);
               } else {
-            this.$message({
+                that.$message({
                   showClose: true,
                   message: res.message,
                   type: "error",
                 });
               }
-        });
+            })
+
+          } else {
+            that.$message({
+              showClose: true,
+              message: "请输入登记原因",
+              type: "error"
+            })
+            return false
+          }
+        })
       },
       /**
        * @description: compare

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-14 16:59:26
+ * @LastEditTime: 2024-01-30 15:51:33
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -75,9 +75,15 @@ class data extends filter {
         width: '140'
       },
       {
-        prop: "zl",
         label: "坐落",
-        minWidth: '130'
+        minWidth: '100',
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.zl} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.zl}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         label: '操作',