修改掉了d_name等命名

ruoyi-ui/src/views/cert/contract/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="130px">
       <el-form-item label="证书类型" prop="certType">
         <el-select v-model="queryParams.certType" placeholder="请选择证书类型" clearable>
           <el-option
@@ -11,18 +11,18 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="姓名或者单位" prop="dName">
+      <el-form-item label="姓名或者单位名称" prop="name">
         <el-input
-          v-model="queryParams.dName"
-          placeholder="请输入姓名或者单位"
+          v-model="queryParams.name"
+          placeholder="请输入姓名或者单位名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="身份证或者编码" prop="dCode">
+      <el-form-item label="邮箱" prop="email">
         <el-input
-          v-model="queryParams.dCode"
-          placeholder="请输入身份证或者编码"
+          v-model="queryParams.email"
+          placeholder="请输入邮箱"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -45,18 +45,18 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="邮箱" prop="dEmail">
+      <el-form-item label="手机号" prop="phone">
         <el-input
-          v-model="queryParams.dEmail"
-          placeholder="请输入邮箱"
+          v-model="queryParams.phone"
+          placeholder="请输入手机号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="手机号" prop="dPhone">
+      <el-form-item label="身份证号码或社会统一信用代码" prop="code" label-width="130px">
         <el-input
-          v-model="queryParams.dPhone"
-          placeholder="请输入手机号"
+          v-model="queryParams.code"
+          placeholder="请输入身份证或者信用代码"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -66,7 +66,6 @@
         <el-button style="margin-left:20px" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
     <el-row :gutter="10" class="mb18">
       <el-col :span="1.5">
         <el-button
@@ -132,8 +131,8 @@
           <dict-tag :options="dict.type.cert_b_type" :value="scope.row.certType"/>
         </template>
       </el-table-column>
-      <el-table-column label="姓名或者单位" align="center" prop="dName"  width="120"/>
-      <el-table-column label="身份证或者编码" align="center" prop="dCode"  width="200"/>
+      <el-table-column label="姓名或者单位名称" align="center" prop="name"  width="130"/>
+      <el-table-column label="身份证号码或社会统一信用代码" align="center" prop="code"  width="220"/>
       <el-table-column label="证书编码" align="center" prop="certId" width="200"/>
       <el-table-column label="专业委员会" align="center" prop="certMajor" width="100">
         <template slot-scope="scope">
@@ -146,8 +145,8 @@
         </template>
       </el-table-column>
       <el-table-column label="证书有效期" align="center" prop="validTerm" width="250"/>
-      <el-table-column label="邮箱" align="center" prop="dEmail" width="200"/>
-      <el-table-column label="手机号" align="center" prop="dPhone" width="120"/>
+      <el-table-column label="邮箱" align="center" prop="email" width="200"/>
+      <el-table-column label="手机号" align="center" prop="phone" width="120"/>
       <el-table-column label="证书文字" align="center" prop="certContent" width="250"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
         <template slot-scope="scope">
@@ -177,9 +176,10 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改B类对话框 -->
+    <!-- 添加或修改B类证书对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px" label-position="top">
+        <!-- label-position="top" -->
         <el-form-item label="证书类型" prop="certType">
           <el-select v-model="form.certType" placeholder="请选择证书类型" style="width:100%">
             <el-option
@@ -190,11 +190,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="姓名或者单位" prop="dName">
-          <el-input v-model="form.dName" placeholder="请输入姓名或者单位" />
+        <el-form-item label="姓名或者单位名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入姓名或者单位名称" />
         </el-form-item>
-        <el-form-item label="身份证或者编码" prop="dCode">
-          <el-input v-model="form.dCode" placeholder="请输入身份证或者编码" />
+        <el-form-item label="身份证号码 或 社会统一信用代码" prop="code">
+          <el-input v-model="form.code" placeholder="请输入身份证号码 或 社会统一信用代码" />
         </el-form-item>
         <el-form-item label="证书编码" prop="certId">
           <el-input v-model="form.certId" placeholder="请输入证书编码" />
@@ -221,11 +221,11 @@
         <el-form-item label="证书有效期" prop="validTerm">
           <el-input v-model="form.validTerm" placeholder="请输入证书有效期" />
         </el-form-item>
-        <el-form-item label="邮箱" prop="dEmail">
-          <el-input v-model="form.dEmail" placeholder="请输入邮箱" />
+        <el-form-item label="邮箱" prop="email">
+          <el-input v-model="form.email" placeholder="请输入邮箱" />
         </el-form-item>
-        <el-form-item label="手机号" prop="dPhone">
-          <el-input v-model="form.dPhone" placeholder="请输入手机号" />
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入手机号" />
         </el-form-item>
         <!-- <el-form-item label="导入系统的时间戳" prop="updateDate">
           <el-date-picker clearable
@@ -295,7 +295,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // B类表格数据
+      // B类证书表格数据
       contractList: [],
       // 弹出层标题
       title: "",
@@ -306,12 +306,12 @@ export default {
         pageNum: 1,
         pageSize: 10,
         certType: null,
-        dName: null,
-        dCode: null,
+        name: null,
+        code: null,
         certId: null,
         certMajor: null,
-        dEmail: null,
-        dPhone: null,
+        email: null,
+        phone: null,
       },
       // 表单参数
       form: {},
@@ -320,7 +320,7 @@ export default {
         certType: [
           { required: true, message: "证书类型不能为空", trigger: "change" }
         ],
-        dName: [
+        name: [
           { required: true, message: "姓名或者单位不能为空", trigger: "blur" }
         ],
         certId: [
@@ -356,7 +356,7 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询B类列表 */
+    /** 查询B类证书列表 */
     getList() {
       this.loading = true;
       listContract(this.queryParams).then(response => {
@@ -375,14 +375,14 @@ export default {
       this.form = {
         id: null,
         certType: null,
-        dName: null,
-        dCode: null,
+        name: null,
+        code: null,
         certId: null,
         certMajor: null,
         issueDate: null,
         validTerm: null,
-        dEmail: null,
-        dPhone: null,
+        email: null,
+        phone: null,
         certContent: null
       };
       this.resetForm("form");
@@ -407,7 +407,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加B类";
+      this.title = "添加证书";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -416,7 +416,7 @@ export default {
       getContract(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改B类";
+        this.title = "修改证书";
       });
     },
     /** 提交按钮 */
@@ -442,7 +442,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除B类编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除证书编号为"' + ids + '"的数据项？').then(function() {
         return delContract(ids);
       }).then(() => {
         this.getList();
@@ -457,7 +457,7 @@ export default {
     },
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = "B类证书信息导入"; // todo
+      this.upload.title = "证书信息导入"; // todo
       this.upload.open = true;
     },
     /** 下载模板操作 */

ruoyi-ui/src/views/cert/grad/index.vue

@@ -184,8 +184,8 @@
     />
 
     <!-- 添加或修改A类证书对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="top">
         <el-form-item label="证书类型" prop="certType">
           <el-select v-model="form.certType" placeholder="请选择证书类型" style="width:100%">
             <el-option