资质管理页面修改

ruoyi-ui/src/views/bid/company/index.vue

@@ -498,7 +498,7 @@
       <el-row :gutter="10">
         <el-col :span="24">
           <el-form-item label="开户许可证照片" prop="annex" label-width="110px">
-            <image-upload v-model="form.annex" type="textarea" placeholder="请输入内容" />
+            <image-upload v-model="form.annex" />
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/bid/myzizhi/index.vue

@@ -1,18 +1,10 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
-      <el-form-item label="文档id" prop="documentId">
+      <el-form-item label="证书编码" prop="documentCode">
-        <el-input
-          v-model="queryParams.documentId"
-          placeholder="请输入文档id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="编码" prop="documentCode">
         <el-input
           v-model="queryParams.documentCode"
-          placeholder="请输入编码"
+          placeholder="请输入证书编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -25,58 +17,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="评级" prop="documentRate">
+      <el-form-item label="证书评级" prop="documentRate">
         <el-input
           v-model="queryParams.documentRate"
-          placeholder="请输入评级"
+          placeholder="请输入证书评级"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
-        <el-date-picker clearable
-          v-model="queryParams.startTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择开始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束时间" prop="endTime">
-        <el-date-picker clearable
-          v-model="queryParams.endTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择结束时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="级别值" prop="level">
-        <el-input
-          v-model="queryParams.level"
-          placeholder="请输入级别值"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="长期有效(0否,1是)" prop="longLalid">
-        <el-input
-          v-model="queryParams.longLalid"
-          placeholder="请输入长期有效(0否,1是)"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="tempId">
-        <el-input
-          v-model="queryParams.tempId"
-          placeholder="请输入"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="租户代码" prop="tenantCode">
-        <el-input
-          v-model="queryParams.tenantCode"
-          placeholder="请输入租户代码"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -133,29 +77,32 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="myzizhiList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="myzizhiList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="文档id" align="center" prop="documentId" />
-      <el-table-column label="编码" align="center" prop="documentCode" />
       <el-table-column label="证书名称" align="center" prop="documentName" />
-      <el-table-column label="评级" align="center" prop="documentRate" />
+      <el-table-column label="证书编码" align="center" prop="documentCode" />
-      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+      <el-table-column label="证书评级" align="center" prop="documentRate" />
+      <el-table-column label="开始时间" align="center" prop="startTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+      <el-table-column label="结束时间" align="center" prop="endTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="级别值" align="center" prop="level" />
+      <el-table-column label="是否长期" align="center" prop="longLalid" >
-      <el-table-column label="长期有效(0否,1是)" align="center" prop="longLalid" />
+        <template slot-scope="scope">
-      <el-table-column label="证书图片" align="center" prop="relatePhoto" />
+          <span v-if="scope.row.longLalid==='0'">有期限</span>
-      <el-table-column label="状态(0,1,2)" align="center" prop="status" />
+          <span v-if="scope.row.longLalid==='1'">长期</span>
-      <el-table-column label="" align="center" prop="tempId" />
+        </template>
-      <el-table-column label="租户代码" align="center" prop="tenantCode" />
+      </el-table-column>
+      <el-table-column label="资质证书" align="center" prop="relatePhoto">
+        <template slot-scope="scope">
+          <image-preview v-model="scope.row.relatePhoto" />
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -176,7 +123,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -186,70 +133,101 @@
     />
 
     <!-- 添加或修改资质管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="文档id" prop="documentId">
+
-          <el-input v-model="form.documentId" placeholder="请输入文档id" />
+        <el-row :gutter="10">
-        </el-form-item>
+          <el-col :span="24">
-        <el-form-item label="编码" prop="documentCode">
+            <el-form-item label="资质证书" prop="relatePhoto">
-          <el-input v-model="form.documentCode" placeholder="请输入编码" />
+              <image-upload v-model="form.relatePhoto" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="证书名称" prop="documentName">
+          </el-col>
-          <el-input v-model="form.documentName" placeholder="请输入证书名称" />
+        </el-row>
-        </el-form-item>
+
-        <el-form-item label="评级" prop="documentRate">
+        <el-row :gutter="10">
-          <el-input v-model="form.documentRate" placeholder="请输入评级" />
+          <el-col :span="12">
-        </el-form-item>
+            <el-form-item label="证书名称" prop="documentName">
-        <el-form-item label="开始时间" prop="startTime">
+              <el-select v-model="form.documentName"
-          <el-date-picker clearable
+                         placeholder="请选择证书名称" style="width: 100%">
-            v-model="form.startTime"
+                <el-option
-            type="date"
+                  v-for="item in zizhiList"
-            value-format="yyyy-MM-dd"
+                  :key="item.id"
-            placeholder="请选择开始时间">
+                  :label="item.documentName"
-          </el-date-picker>
+                  :value="item.documentName">
-        </el-form-item>
+                </el-option>
-        <el-form-item label="结束时间" prop="endTime">
+              </el-select>
-          <el-date-picker clearable
+            </el-form-item>
-            v-model="form.endTime"
+          </el-col>
-            type="date"
+          <el-col :span="12">
-            value-format="yyyy-MM-dd"
+            <el-form-item label="证书编码" prop="documentCode">
-            placeholder="请选择结束时间">
+              <el-input v-model="form.documentCode" placeholder="请输入证书编码" />
-          </el-date-picker>
+            </el-form-item>
-        </el-form-item>
+          </el-col>
-        <el-form-item label="级别值" prop="level">
+        </el-row>
-          <el-input v-model="form.level" placeholder="请输入级别值" />
+
-        </el-form-item>
+        <el-row :gutter="10">
-        <el-form-item label="长期有效(0否,1是)" prop="longLalid">
+          <el-col :span="12">
-          <el-input v-model="form.longLalid" placeholder="请输入长期有效(0否,1是)" />
+            <el-form-item label="证书评级" prop="documentRate">
-        </el-form-item>
+              <el-input v-model="form.documentRate" placeholder="请输入证书评级" />
-        <el-form-item label="证书图片" prop="relatePhoto">
+            </el-form-item>
-          <el-input v-model="form.relatePhoto" type="textarea" placeholder="请输入内容" />
+          </el-col>
-        </el-form-item>
+          <el-col :span="12">
-        <el-form-item label="" prop="tempId">
+            <el-form-item label="是否长期" prop="longLalid">
-          <el-input v-model="form.tempId" placeholder="请输入" />
+              <el-radio-group v-model="form.longLalid" @input="longLalidChange">
-        </el-form-item>
+                <el-radio label="0">有期限</el-radio>
-        <el-form-item label="租户代码" prop="tenantCode">
+                <el-radio label="1">长期</el-radio>
-          <el-input v-model="form.tenantCode" placeholder="请输入租户代码" />
+              </el-radio-group>
-        </el-form-item>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10" v-if="form.longLalid==='0'">
+          <el-col :span="12">
+            <el-form-item label="开始时间" prop="startTime">
+              <el-date-picker clearable style="width: 100%"
+                              v-model="form.startTime"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择开始时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="结束时间" prop="endTime">
+              <el-date-picker clearable style="width: 100%"
+                              v-model="form.endTime"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择结束时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
+
       </el-form>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listMyzizhi, getMyzizhi, delMyzizhi, addMyzizhi, updateMyzizhi } from "@/api/bid/myzizhi"
+import { listZizhi } from "@/api/bid/zizhi"
 
 export default {
   name: "Myzizhi",
   data() {
     return {
+      zizhiList:[],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -289,6 +267,27 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        relatePhoto: [
+          { required: true, message: "资质证书不能为空", trigger: "blur" }
+        ],
+        documentName: [
+          { required: true, message: "证书名称不能为空", trigger: "blur" }
+        ],
+        documentCode: [
+          { required: true, message: "证书编码不能为空", trigger: "blur" }
+        ],
+        documentRate: [
+          { required: true, message: "证书评级不能为空", trigger: "blur" }
+        ],
+        longLalid: [
+          { required: true, message: "是否长期不能为空", trigger: "blur" }
+        ],
+        startTime: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" }
+        ],
+        endTime: [
+          { required: true, message: "结束时间不能为空", trigger: "blur" }
+        ],
       }
     }
   },
@@ -305,6 +304,15 @@ export default {
         this.loading = false
       })
     },
+    /** 查询资质证书列表 */
+    getListZizhi() {
+      listZizhi({
+        pageNum: 1,
+        pageSize: 1000000000,
+      }).then(response => {
+        this.zizhiList = response.rows
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false
@@ -321,7 +329,7 @@ export default {
         startTime: null,
         endTime: null,
         level: null,
-        longLalid: null,
+        longLalid: '0',
         relatePhoto: null,
         status: null,
         tempId: null,
@@ -352,13 +360,15 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset()
+      this.reset();
+      this.getListZizhi();
       this.open = true
       this.title = "添加资质管理"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset()
+      this.reset();
+      this.getListZizhi();
       const id = row.id || this.ids
       getMyzizhi(id).then(response => {
         this.form = response.data
@@ -401,6 +411,11 @@ export default {
       this.download('bid/myzizhi/export', {
         ...this.queryParams
       }, `myzizhi_${new Date().getTime()}.xlsx`)
+    },
+    // 是否长期 绑定值变化时触发
+    longLalidChange(){
+      this.form.startTime = null;
+      this.form.endTime = null;
     }
   }
 }