Browse Source

名称字段

hanfucheng 1 year ago
parent
commit
a9d0c8dd48

+ 6 - 6
data-ui/src/views/data/basicdata/firehydrant/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
-      <el-form-item label="消火栓名称" prop="name" label-width="120px">
+      <el-form-item label="名称" prop="name" label-width="120px">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入消火栓名称"
+          placeholder="请输入名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -142,7 +142,7 @@
     <el-table v-loading="loading" :data="firehydrantList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <!--      <el-table-column label="主键id" align="center" prop="id" />-->
-      <el-table-column label="消火栓名称" align="center" prop="name"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="消火栓类型" align="center" prop="firehydrantType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.firehydrant" :value="scope.row.firehydrantType"/>
@@ -206,7 +206,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入消火栓名称" maxlength="32"/>
+              <el-input v-model="form.name" placeholder="请输入名称" maxlength="32"/>
             </el-form-item>
             <el-form-item label="联系人" prop="firehydrantPerson">
               <el-input v-model="form.firehydrantPerson" placeholder="请输入联系人" maxlength="20"/>
@@ -277,7 +277,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入消火栓名称" :disabled="true"/>
+              <el-input v-model="form.name" placeholder="请输入名称" :disabled="true"/>
             </el-form-item>
             <el-form-item label="经度" prop="longitude" @dblclick.native="showMap">
               <el-input v-model="form.longitude" placeholder="鼠标双击此处以选择经纬度" maxlength="32"/>
@@ -399,7 +399,7 @@
         // 表单校验
         rules: {
           name: [
-            {required: true, message: '消火栓名称不能为空', trigger: 'blur'},
+            {required: true, message: '名称不能为空', trigger: 'blur'},
             {min: 1, max: 255, trigger: 'blur'}
           ],
           firehydrantType: [

+ 7 - 7
data-ui/src/views/data/digitalagriculture/agricultural_cooperatives/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-if="showSearch" label-width="68px" @submit.native.prevent>
-      <el-form-item label-width="130px" label="单位名称" prop="name">
+      <el-form-item label-width="130px" label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入单位名称"
+          placeholder="请输入名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -150,7 +150,7 @@
     <el-table v-loading="loading" :data="CooperativesList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <!--<el-table-column label="${comment}" align="center" prop="id" />-->
-      <el-table-column label="单位名称" align="center" prop="name"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <!--<el-table-column label="详细通讯地址" align="center" prop="address" />
       <el-table-column label="注册登记机关" align="center" prop="registrationAuthority" />-->
       <!--<el-table-column label="注册时间" align="center" prop="registerDate" width="180">
@@ -221,8 +221,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="单位名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入单位名称" maxlength="30"/>
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" maxlength="30"/>
             </el-form-item>
 
             <el-form-item label="经营规模" prop="registrationAuthority">
@@ -464,8 +464,8 @@
         // 表单校验
         rules: {
           name: [
-            {required: true, message: "单位名称不能为空", trigger: "blur"},
-            {min: 2, max: 20, message: '单位名称长度必须介于 2 和 20 之间', trigger: 'blur'}
+            {required: true, message: "名称不能为空", trigger: "blur"},
+            {min: 2, max: 20, message: '名称长度必须介于 2 和 20 之间', trigger: 'blur'}
           ],
           legalPerson: [
             {required: true, message: "法人姓名不能为空", trigger: "blur"},

+ 7 - 7
data-ui/src/views/data/digitalagriculture/botany_protect_info/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-if="showSearch" label-width="68px" @submit.native.prevent>
-      <el-form-item label-width="130px" label="单位名称" prop="name">
+      <el-form-item label-width="130px" label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入单位名称"
+          placeholder="请输入名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -159,7 +159,7 @@
     <el-table v-loading="loading" :data="BotanyProtectInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <!--<el-table-column label="${comment}" align="center" prop="id" />-->
-      <el-table-column label="单位名称" align="center" prop="name"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="详细通讯地址" align="center" prop="address" />
       <!--<el-table-column label="注册登记机关" align="center" prop="registrationAuthority" />-->
       <!--<el-table-column label="注册时间" align="center" prop="registerDate" width="180">-->
@@ -224,8 +224,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="单位名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入单位名称" maxlength="20"/>
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" maxlength="20"/>
             </el-form-item>
             <el-form-item label="详细通讯地址" prop="address">
               <el-input v-model="form.address" placeholder="请输入详细通讯地址" maxlength="20"/>
@@ -446,8 +446,8 @@
           //   {required: true, message: "法人姓名不能为空", trigger: "blur"},
           // ],
           name: [
-            {required: true, message: "单位名称不能为空", trigger: "blur"},
-            {min: 2, max: 20, message: '单位名称长度必须介于 2 和 20 之间', trigger: 'blur'}
+            {required: true, message: "名称不能为空", trigger: "blur"},
+            {min: 2, max: 20, message: '名称长度必须介于 2 和 20 之间', trigger: 'blur'}
           ],
           membersNum: [
             {required: true, message: "从业人数不能为空", trigger: "blur"},

+ 6 - 6
data-ui/src/views/data/digitalfirecontrol/basiclinkageforce/index.vue

@@ -10,10 +10,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="单位名称" prop="company">
+      <el-form-item label="名称" prop="company">
         <el-input
           v-model="queryParams.company"
-          placeholder="请输入单位名称"
+          placeholder="请输入名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -124,7 +124,7 @@
       <el-table-column type="selection" width="55" align="center"/>
       <!--<el-table-column label="主键id" align="center" prop="id"/>-->
       <el-table-column label="所属机构" align="center" prop="institutionName"/>
-      <el-table-column label="单位名称" align="center" prop="company"/>
+      <el-table-column label="名称" align="center" prop="company"/>
       <el-table-column label="经度" align="center" prop="longitude"/>
       <el-table-column label="纬度" align="center" prop="latitude"/>
       <el-table-column label="铲车数量" align="center" prop="forkliftNum"/>
@@ -190,8 +190,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="单位名称" prop="company">
-              <el-input v-model="form.company" placeholder="请输入单位名称" maxlength="20"/>
+            <el-form-item label="名称" prop="company">
+              <el-input v-model="form.company" placeholder="请输入名称" maxlength="20"/>
             </el-form-item>
             <el-form-item label="纬度" prop="latitude" @dblclick.native="showMap">
               <el-input v-model="form.latitude" placeholder="鼠标双击此处以选择经纬度" maxlength="32"/>
@@ -321,7 +321,7 @@ export default {
           {required: true, message: '所属机构不能为空', trigger: 'change'}
         ],
         company: [
-          {required: true, message: '单位名称不能为空', trigger: 'blur'}
+          {required: true, message: '名称不能为空', trigger: 'blur'}
         ],
         longitude: [
           {required: true, message: "经度不能为空", trigger: [ 'blur', 'change' ]},

+ 6 - 6
data-ui/src/views/data/digitalfirecontrol/otherlinkageforce/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
-      <el-form-item label="单位名称" prop="company">
+      <el-form-item label="名称" prop="company">
         <el-input
           v-model="queryParams.company"
-          placeholder="请输入单位"
+          placeholder="请输入名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -114,7 +114,7 @@
     <el-table v-loading="loading" :data="otherlinkageforceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <!--<el-table-column label="主键id" align="center" prop="id"/>-->
-      <el-table-column label="单位名称" align="center" prop="company"/>
+      <el-table-column label="名称" align="center" prop="company"/>
       <el-table-column label="单位电话" align="center" prop="companyPhone"/>
       <el-table-column label="联系人" align="center" prop="contacts"/>
       <el-table-column label="联系人电话" align="center" prop="contactsPhone"/>
@@ -167,8 +167,8 @@
 <!--        </el-row>-->
         <el-row>
           <el-col :span="12">
-            <el-form-item label="单位名称" prop="company">
-              <el-input v-model="form.company" placeholder="请输入单位名称" maxlength="20"/>
+            <el-form-item label="名称" prop="company">
+              <el-input v-model="form.company" placeholder="请输入名称" maxlength="20"/>
             </el-form-item>
             <el-form-item label="联系人" prop="contacts">
               <el-input v-model="form.contacts" placeholder="请输入联系人" maxlength="20"/>
@@ -297,7 +297,7 @@ export default {
       // 表单校验
       rules: {
         company: [
-          {required: true, message: '单位名称不能为空', trigger: 'blur'}
+          {required: true, message: '名称不能为空', trigger: 'blur'}
         ],
         companyPhone: [
           {required: true, message: '单位电话不能为空', trigger: 'blur'},

+ 4 - 4
src/main/java/com/sooka/sponest/data/basicdata/domain/CenterdataTForestFirehydrant.java

@@ -39,11 +39,11 @@ public class CenterdataTForestFirehydrant extends BaseBusinessEntity {
     private String firehydrantTypeLabel;
 
     /**
-     * 消火栓名称
+     * 名称
      */
-    @ApiModelProperty(value = "消火栓名称", required = false)
-    @Excel(name = "消火栓名称")
-    @NotBlank(message = "消火栓名称不能为空")
+    @ApiModelProperty(value = "名称", required = false)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**

+ 4 - 4
src/main/java/com/sooka/sponest/data/digitalagriculture/domain/CenterdataTFarmBotanyProtectInfo.java

@@ -29,11 +29,11 @@ public class CenterdataTFarmBotanyProtectInfo extends BaseBusinessEntity {
     private String id;
 
     /**
-     * 单位名称
+     * 名称
      */
-    @ApiModelProperty(value = "单位名称", required = true)
-    @Excel(name = "单位名称")
-    @NotBlank(message = "单位名称不能为空")
+    @ApiModelProperty(value = "名称", required = true)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**

+ 3 - 3
src/main/java/com/sooka/sponest/data/digitalfirecontrol/domain/CenterdataTFirecontrolBasicLinkageForce.java

@@ -47,9 +47,9 @@ public class CenterdataTFirecontrolBasicLinkageForce extends BaseBusinessEntity
     /**
      * 单位名称
      */
-    @ApiModelProperty(value = "单位名称", required = true)
-    @Excel(name = "单位名称")
-    @NotBlank(message = "单位名称不能为空")
+    @ApiModelProperty(value = "名称", required = true)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String company;
 
     /**

+ 3 - 3
src/main/java/com/sooka/sponest/data/digitalfirecontrol/domain/CenterdataTFirecontrolOtherLinkageForce.java

@@ -33,9 +33,9 @@ public class CenterdataTFirecontrolOtherLinkageForce extends BaseBusinessEntity
     /**
      * 单位
      */
-    @ApiModelProperty(value = "单位", required = true)
-    @Excel(name = "单位名称")
-    @NotBlank(message = "单位名称不能为空")
+    @ApiModelProperty(value = "名称", required = true)
+    @Excel(name = "名称")
+    @NotBlank(message = "名称不能为空")
     private String company;
 
     /**