修改

src/api/stamp/list.js

@@ -1,15 +1,15 @@
 import request from '@/utils/request'
 
-// 查询印章列表
+// 查询列表
 export function listStamp(query) {
   return request({
-    url: '/bpm/oa-stamp-Stamp/page',
+    url: '/bpm/oa-stamp-info/page',
     method: 'get',
     params: query
   })
 }
 
-// 获取印章精简信息列表
+// 获取精简信息列表
 export function listSimpleStamps() {
   return request({
     url: '/bpm/oa-stamp-Stamp/list',
@@ -17,44 +17,53 @@ export function listSimpleStamps() {
   })
 }
 
-// 查询印章详细
+// 查询详细
 export function getStamp(StampId) {
   return request({
-    url: '/bpm/oa-stamp-Stamp/get?id=' + StampId,
+    url: '/bpm/oa-stamp-info/get?id=' + StampId,
     method: 'get'
   })
 }
 
-// 新增印章
+// 新增
 export function addStamp(data) {
   return request({
-    url: '/bpm/oa-stamp-Stamp/create',
+    url: '/bpm/oa-stamp-info/create',
     method: 'Stamp',
     data: data
   })
 }
 
-// 修改印章
+// 作废
+export function invalidStamp(data) {
+  return request({
+    url: '/bpm/oa-stamp-info/invalid',
+    method: 'put',
+    data: data
+  })
+}
+
+// 修改
 export function updateStamp(data) {
   return request({
-    url: '/bpm/oa-stamp-Stamp/update',
+    url: '/bpm/oa-stamp-info/update',
     method: 'put',
     data: data
   })
 }
 
-// 删除印章
+// 删除
 export function delStamp(StampId) {
   return request({
-    url: '/bpm/oa-stamp-Stamp/delete?id=' + StampId,
+    url: '/bpm/oa-stamp-info/delete?id=' + StampId,
     method: 'delete'
   })
 }
 
-// 导出印章
+// 导出
 export function exportStamp(query) {
   return request({
-    url: '/bpm/oa-stamp-Stamp/export-excel',
+    url: '/bpm/oa-stamp-info/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'

src/views/stamp/list/index.vue

@@ -23,9 +23,17 @@
         <el-input v-model="queryParams.stampTitle" placeholder="请输入用印标题" clearable style="width: 250px"
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="状态" prop="auditStatus">
-        <el-select v-model="queryParams.auditStatus" placeholder="审批状态" clearable style="width: 250px">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_TASK_AUDIT_STATUS)" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="状态" clearable style="width: 250px">
+          <el-option label="已完成" value="0"/>
+          <el-option label="已作废" value="1"/>
+          <el-option label="已生效" value="2"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="数据来源" prop="infoSource">
+        <el-select v-model="queryParams.infoSource" placeholder="数据来源" clearable style="width: 250px">
+          <el-option label="流程添加" value="0"/>
+          <el-option label="手动添加" value="1"/>
         </el-select>
       </el-form-item>
       <el-form-item label="申请时间" prop="createTime">
@@ -42,11 +50,11 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['stamp:list:create']">新增</el-button>
+          >新增</el-button>
       </el-col>
       <el-col :span="1.5">
           <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                     v-hasPermi="['stamp:list:export']">导出</el-button>
+                     >导出</el-button>
         </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -57,10 +65,15 @@
       <el-table-column label="职位" align="center" prop="position" min-width="100" />
       <el-table-column label="手机号" align="center" prop="employeePhone" min-width="100" />
       <el-table-column label="用印标题" align="center" prop="stampTitle" min-width="150" />
-      <el-table-column label="创建人" align="center" prop="currentAuditEmployeeName" min-width="100" />
+      <el-table-column label="创建人" align="center" prop="createEmployeeName" min-width="100" />
       <el-table-column label="状态" align="center" prop="status">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+         <span>{{ scope.row.status == 0 ? '已完成' : scope.row.status == 1 ? '已作废' : '已生效'}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="数据来源" align="center" prop="infoSource">
+        <template v-slot="scope">
+         <span>{{ scope.row.infoSource == 0 ? '流程添加' : '手动添加'}}</span>
         </template>
       </el-table-column>
       <el-table-column label="创建时间"  align="center" prop="createTime" min-width="180">
@@ -68,14 +81,14 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="150">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['stamp:list:update']">修改</el-button>
+            >修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['stamp:list:delete']">删除</el-button>
+            >删除</el-button>
           <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)"
-            v-hasPermi="['stamp:list:detail']">详情</el-button>
+           >详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -250,7 +263,8 @@ export default {
         position: undefined,
         employeePhone: undefined,
         stampTitle: undefined,
-        auditStatus: undefined,
+        status: undefined,
+        infoSource:undefined,
         createTime: []
       },
       // 表单参数

src/views/stamp/sealList/index.vue

@@ -6,7 +6,8 @@
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="queryParams.status" placeholder="印章状态" clearable>
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+            <el-option label="打开" value="1"/>
+            <el-option label="关闭" value="2"/>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -34,7 +35,7 @@
         <el-table-column label="有效期止" align="center" prop="endDate" />
         <el-table-column label="状态" align="center" prop="status">
           <template v-slot="scope">
-            <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
+            <span>{{ scope.row.status == 1 ? '打开' : '关闭'}}</span>
           </template>
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -76,8 +77,8 @@
           </el-form-item>
           <el-form-item label="状态">
             <el-radio-group v-model="form.status">
-              <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.value">
-                {{dict.label}}</el-radio>
+              <el-radio label="1">打开</el-radio>
+              <el-radio label="2">关闭</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="附件">