去掉了证书B的专业委员会，修改证书文字的文本框

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

@@ -19,6 +19,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="身份证号码或社会统一信用代码" prop="code" label-width="130px">
+        <el-input
+          v-model="queryParams.code"
+          placeholder="请输入身份证或者信用代码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="邮箱" prop="email">
         <el-input
           v-model="queryParams.email"
@@ -35,7 +43,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="专业委员会" prop="certMajor">
+      <!-- <el-form-item label="专业委员会" prop="certMajor">
         <el-select v-model="queryParams.certMajor" placeholder="请选择专业委员会" clearable>
           <el-option
             v-for="dict in dict.type.cert_major_type"
@@ -44,7 +52,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="手机号" prop="phone">
         <el-input
           v-model="queryParams.phone"
@@ -53,14 +61,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="身份证号码或社会统一信用代码" prop="code" label-width="130px">
-        <el-input
-          v-model="queryParams.code"
-          placeholder="请输入身份证或者信用代码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      
       <el-form-item >
         <el-button style="margin-left:20px" type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button style="margin-left:20px" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -134,21 +135,21 @@
       <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">
+      <!-- <el-table-column label="专业委员会" align="center" prop="certMajor" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.cert_major_type" :value="scope.row.certMajor"/>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="发证时间" align="center" prop="issueDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.issueDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="证书有效期" align="center" prop="validTerm" width="250"/>
-      <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" prop="templateId" width="250">
+      <el-table-column label="手机号" align="center" prop="phone" width="120"/>
+      <el-table-column label="邮箱" align="center" prop="email" width="200"/>
+      <el-table-column label="证书模板" align="center" prop="templateId" width="150">
         <template slot-scope="scope">
           <span>{{scope.row.templateId?tempHandle(scope.row.templateId):""}}</span>
         </template>
@@ -204,7 +205,7 @@
         <el-form-item label="证书编码" prop="certId">
           <el-input v-model="form.certId" placeholder="请输入证书编码" />
         </el-form-item>
-        <el-form-item label="专业委员会" prop="certMajor">
+        <!-- <el-form-item label="专业委员会" prop="certMajor">
           <el-select v-model="form.certMajor" placeholder="请选择专业委员会" style="width:100%">
             <el-option
               v-for="dict in dict.type.cert_major_type"
@@ -213,14 +214,7 @@
 :value="parseInt(dict.value)"
             ></el-option>
           </el-select>
-        </el-form-item>
-        <el-form-item label="证书模板" prop="templateId">
-          <el-select v-model="form.templateId" placeholder="请选择证书模板" filterable clearable
-            :style="{width: '100%'}">
-            <el-option v-for="(item, index) in tempValueOptions" :key="index" :label="item.label"
-              :value="item.value" ></el-option>
-          </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="发证时间" prop="issueDate" >
           <el-date-picker clearable
             v-model="form.issueDate"
@@ -247,8 +241,15 @@
             placeholder="请选择导入系统的时间戳" style="width:100%">
           </el-date-picker>
         </el-form-item> -->
-        <el-form-item label="证书文字">
-          <editor v-model="form.certContent" :min-height="192"/>
+        <el-form-item label="证书模板" prop="templateId">
+          <el-select v-model="form.templateId" placeholder="请选择证书模板" filterable clearable
+            :style="{width: '100%'}">
+            <el-option v-for="(item, index) in tempValueOptions" :key="index" :label="item.label"
+              :value="item.value" ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="证书文字" prop="certContent">
+          <el-input v-model="form.certContent" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -339,20 +340,18 @@ export default {
         certId: [
           { required: true, message: "证书编码不能为空", trigger: "blur" }
         ],
-        certMajor: [
-          { required: true, message: "专业委员会不能为空", trigger: "change" }
-        ],
         issueDate: [
           { required: true, message: "发证时间不能为空", trigger: "blur" }
         ],
         validTerm: [
           { required: true, message: "证书有效期不能为空", trigger: "blur" }
         ],
-        templateId: [{
-          required: true,
-          message: '请选择证书模板',
-          trigger: 'blur'
-        }]
+        templateId: [
+          { required: true, message: '请选择证书模板', trigger: 'blur' }
+        ],
+        certContent: [
+          { required: true, message: "证书文字不能为空", trigger: "blur" }
+        ]
       },
       upload: {
         // 是否显示弹出层（用户导入）

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

@@ -63,7 +63,7 @@
 
     <el-table v-loading="loading" :data="tempList" @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="${comment}" align="center" prop="id" /> -->
       <el-table-column label="模板名称" align="center" prop="name" />
       <el-table-column label="模板地址" align="center" prop="url" width="100">
         <template slot-scope="scope">
@@ -217,6 +217,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          
           if (this.form.id != null) {
             updateTemp(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");