修改

.env.dev

@@ -6,9 +6,9 @@ VUE_APP_TITLE = 爱思系统
 
 # 爱思系统/开发环境
 # 赵培清
-# VUE_APP_BASE_API = 'http://192.168.100.213:48080'
+VUE_APP_BASE_API = 'http://192.168.100.213:48080'
 # 王东坡
-VUE_APP_BASE_API = 'http://192.168.100.64:48081'
+# VUE_APP_BASE_API = 'http://192.168.100.64:48081'
 # 测试
 # VUE_APP_BASE_API = 'http://47.103.79.143:48081'
 

src/api/oa/stamp.js

@@ -1,5 +1,12 @@
 import request from '@/utils/request'
-
+// 用印类型信息列表
+export function typeList(query) {
+  return request({
+    url: '/bpm/oa-stamp-seal/list',
+    method: 'get',
+    params: query
+  })
+}
 // 创建流程
 export function create(data) {
   return request({

src/api/stamp/list.js

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

src/api/stamp/sealList.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询印章列表
+export function listSeal(query) {
+  return request({
+    url: '/bpm/oa-stamp-seal/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取印章精简信息列表
+export function listSimpleSeals() {
+  return request({
+    url: '/bpm/oa-stamp-seal/list',
+    method: 'get'
+  })
+}
+
+// 查询印章详细
+export function getSeal(SealId) {
+  return request({
+    url: '/bpm/oa-stamp-seal/get?id=' + SealId,
+    method: 'get'
+  })
+}
+
+// 新增印章
+export function addSeal(data) {
+  return request({
+    url: '/bpm/oa-stamp-seal/create',
+    method: 'Seal',
+    data: data
+  })
+}
+
+// 修改印章
+export function updateSeal(data) {
+  return request({
+    url: '/bpm/oa-stamp-seal/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除印章
+export function delSeal(SealId) {
+  return request({
+    url: '/bpm/oa-stamp-seal/delete?id=' + SealId,
+    method: 'delete'
+  })
+}
+
+// 导出印章
+export function exportSeal(query) {
+  return request({
+    url: '/bpm/oa-stamp-seal/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/views/oa/stamp/DataList.vue

@@ -53,7 +53,7 @@
       <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="stampSealName" min-width="100" />
+      <!-- <el-table-column label="用章类型" align="center" prop="stampSealName" min-width="100" /> -->
       <el-table-column label="申请时间"  align="center" prop="createTime" min-width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>

src/views/oa/stamp/detail.vue

@@ -158,16 +158,7 @@ export default {
   },
   data() {
     return {
-      oaStampSeal:[
-        {
-          id:1,
-          sealName:'公章'
-        },
-        {
-          id:2,
-          sealName:'财务章'
-        }
-      ],
+      oaStampSeal:[],
       fullscreenLoading:false,
       loading:false,
       reason: '',
@@ -180,6 +171,7 @@ export default {
     };
   },
   created() {
+    this.getTypeList();
   },
   watch: {
     id: {
@@ -190,6 +182,14 @@ export default {
     }
   },
   methods: {
+     // 类型信息列表
+     getTypeList(){
+      typeList().then(
+        response => {
+          this.oaStampSeal = response.data;
+        }
+      );
+    },
     getDateStar(ms) {
       return getDate(ms);
     },

src/views/oa/stamp/edit.vue

@@ -93,7 +93,7 @@
 </template>
 
 <script>
-import { getDetail, create,reCommit, save, deleteById,closeById } from "@/api/oa/stamp"
+import { typeList,getDetail, create,reCommit, save, deleteById,closeById } from "@/api/oa/stamp"
 import {getDate} from "@/utils/dateUtils";
 import { getUserProfile } from "@/api/system/user";
 import { listDept } from "@/api/system/dept";
@@ -119,16 +119,7 @@ export default {
   },
   data() {
     return {
-      oaStampSeal:[
-        {
-          id:1,
-          sealName:'公章'
-        },
-        {
-          id:2,
-          sealName:'财务章'
-        }
-      ],
+      oaStampSeal:[],
       fullscreenLoading:false,
       tasks:[],
       loading:false,
@@ -182,6 +173,7 @@ export default {
 
   created() {
     this.getDeptList();
+    this.getTypeList();
   },
   watch: {
     id: {
@@ -196,6 +188,14 @@ export default {
     }
   },
   methods: {
+    // 类型信息列表
+    getTypeList(){
+      typeList().then(
+        response => {
+          this.oaStampSeal = response.data;
+        }
+      );
+    },
     getDateStar(ms) {
       return getDate(ms);
     },

src/views/stamp/list/index.vue

@@ -42,22 +42,21 @@
     <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="['meeting:reserveList:create']">新增</el-button>
+          v-hasPermi="['stamp:list:create']">新增</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="['meeting:reserveList:export']">导出</el-button>
+                     v-hasPermi="['stamp:list:export']">导出</el-button>
         </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="postList">
+    <el-table v-loading="loading" :data="StampList">
       <el-table-column label="用印人" align="center" prop="employeeName" min-width="100" />
       <el-table-column label="部门" align="center" prop="deptName" min-width="100" />
       <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="stampSealName" min-width="100" />
       <el-table-column label="创建人" align="center" prop="currentAuditEmployeeName" min-width="100" />
       <el-table-column label="状态" align="center" prop="status">
         <template v-slot="scope">
@@ -72,11 +71,11 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['meeting:reserveList:update']">修改</el-button>
+            v-hasPermi="['stamp:list:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['meeting:reserveList:delete']">删除</el-button>
+            v-hasPermi="['stamp:list:delete']">删除</el-button>
           <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)"
-            v-hasPermi="['meeting:reserveList:detail']">详情</el-button>
+            v-hasPermi="['stamp:list:detail']">详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -206,7 +205,8 @@
 </template>
 
 <script>
-import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/meeting";
+import { listStamp, getStamp, delStamp, addStamp, updateStamp, exportStamp } from "@/api/stamp/list";
+import { typeList } from "@/api/oa/stamp"
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
@@ -214,7 +214,7 @@ import { DICT_TYPE } from '@/utils/dict'
 import { listDept } from "@/api/system/dept";
 import { getBaseHeader } from "@/utils/request";
 export default {
-  name: "SystemPost",
+  name: "SystemStamp",
   components: {
     PeopleSelect,
     Treeselect,
@@ -222,14 +222,6 @@ export default {
   data() {
     return {
       oaStampSeal:[
-        {
-          id:1,
-          sealName:'公章'
-        },
-        {
-          id:2,
-          sealName:'财务章'
-        }
       ],
       posOptions:[],
        // 部门列表
@@ -243,7 +235,7 @@ export default {
       // 总条数
       total: 0,
       // 岗位表格数据
-      postList: [],
+      StampList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -289,8 +281,17 @@ export default {
   created() {
     this.getList();
     this.getListDept();
+    this.getTypeList();
   },
   methods: {
+     // 类型信息列表
+     getTypeList(){
+      typeList().then(
+        response => {
+          this.oaStampSeal = response.data;
+        }
+      );
+    },
      /** 查询部门列表 */
      getListDept() {
       listDept().then(response => {
@@ -321,8 +322,8 @@ export default {
     /** 查询岗位列表 */
     getList() {
       this.loading = true;
-      listPost(this.queryParams).then(response => {
-        this.postList = response.data.list;
+      listStamp(this.queryParams).then(response => {
+        this.StampList = response.data.list;
         this.total = response.data.total;
         this.loading = false;
       });
@@ -404,7 +405,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id
-      getPost(id).then(response => {
+      getStamp(id).then(response => {
         this.form = response.data;
         let files = response.data.fileList;
         if (files) {
@@ -429,7 +430,7 @@ export default {
     handleDetail(row) {
       this.reset();
       const id = row.id
-      getPost(id).then(response => {
+      getStamp(id).then(response => {
         this.form = response.data;
         this.openDetail = true;
         this.title = "详情";
@@ -442,13 +443,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id !== undefined) {
-            updatePost(this.form).then(response => {
+            updateStamp(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addPost(this.form).then(response => {
+            addStamp(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -461,7 +462,7 @@ export default {
     handleDelete(row) {
       const ids = row.id;
       this.$modal.confirm('是否确认删除岗位编号为"' + ids + '"的数据项?').then(function () {
-        return delPost(ids);
+        return delStamp(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
@@ -472,7 +473,7 @@ export default {
       const queryParams = this.queryParams;
       this.$modal.confirm('是否确认导出所有岗位数据项?').then(() => {
         this.exportLoading = true;
-        return exportPost(queryParams);
+        return exportStamp(queryParams);
       }).then(response => {
         this.$download.excel(response, '岗位数据.xls');
         this.exportLoading = false;

src/views/stamp/sealList/index.vue

@@ -2,10 +2,10 @@
     <div class="app-container">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="名称" prop="sealName">
-          <el-input v-model="queryParams.sealName" placeholder="请输入岗位名称" clearable @keyup.enter.native="handleQuery"/>
+          <el-input v-model="queryParams.sealName" placeholder="请输入印章名称" clearable @keyup.enter.native="handleQuery"/>
         </el-form-item>
         <el-form-item label="状态" prop="status">
-          <el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
+          <el-select v-model="queryParams.status" placeholder="印章状态" clearable>
             <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
           </el-select>
         </el-form-item>
@@ -18,16 +18,16 @@
       <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="['system:post:create']">新增</el-button>
+                     v-hasPermi="['stamp:Seal:create']">新增</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="['system:post:export']">导出</el-button>
+                     v-hasPermi="['stamp:Seal:export']">导出</el-button>
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
   
-      <el-table v-loading="loading" :data="postList">
+      <el-table v-loading="loading" :data="SealList">
         <el-table-column label="类别" align="center" prop="sealType" />
         <el-table-column label="名称" align="center" prop="sealName" />
         <el-table-column label="有效期起" align="center" prop="startDate" />
@@ -45,9 +45,9 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template v-slot="scope">
             <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                       v-hasPermi="['system:post:update']">修改</el-button>
+                       v-hasPermi="['stamp:Seal:update']">修改</el-button>
             <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                       v-hasPermi="['system:post:delete']">删除</el-button>
+                       v-hasPermi="['stamp:Seal:delete']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -55,7 +55,7 @@
       <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
                   @pagination="getList"/>
   
-      <!-- 添加或修改岗位对话框 -->
+      <!-- 添加或修改印章对话框 -->
       <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-form-item label="类别" prop="sealType">
@@ -99,13 +99,13 @@
   </template>
   
   <script>
-  import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/meeting";
+  import { listSeal, getSeal, delSeal, addSeal, updateSeal, exportSeal } from "@/api/stamp/sealList";
   import { getBaseHeader } from "@/utils/request";
   import {CommonStatusEnum} from '@/utils/constants'
   import { getDictDatas, DICT_TYPE } from '@/utils/dict'
   
   export default {
-    name: "SystemPost",
+    name: "StampSeal",
     data() {
       return {
         files: [],
@@ -121,8 +121,8 @@
         showSearch: true,
         // 总条数
         total: 0,
-        // 岗位表格数据
-        postList: [],
+        // 印章表格数据
+        SealList: [],
         // 弹出层标题
         title: "",
         // 是否显示弹出层
@@ -193,11 +193,11 @@
       }
       this.form.fileIdList = fileIds;
     },
-      /** 查询岗位列表 */
+      /** 查询印章列表 */
       getList() {
         this.loading = true;
-        listPost(this.queryParams).then(response => {
-          this.postList = response.data.list;
+        listSeal(this.queryParams).then(response => {
+          this.SealList = response.data.list;
           this.total = response.data.total;
           this.loading = false;
         });
@@ -234,13 +234,13 @@
       handleAdd() {
         this.reset();
         this.open = true;
-        this.title = "添加岗位";
+        this.title = "添加印章";
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
         this.reset();
         const id = row.id
-        getPost(id).then(response => {
+        getSeal(id).then(response => {
           this.form = response.data;
           let files = response.data.fileList;
         if (files) {
@@ -258,7 +258,7 @@
           }
         }
           this.open = true;
-          this.title = "修改岗位";
+          this.title = "修改印章";
         });
       },
       /** 提交按钮 */
@@ -266,13 +266,13 @@
         this.$refs["form"].validate(valid => {
           if (valid) {
             if (this.form.id !== undefined) {
-              updatePost(this.form).then(response => {
+              updateSeal(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();
               });
             } else {
-              addPost(this.form).then(response => {
+              addSeal(this.form).then(response => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
                 this.getList();
@@ -284,8 +284,8 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const ids = row.id;
-        this.$modal.confirm('是否确认删除岗位编号为"' + ids + '"的数据项?').then(function() {
-            return delPost(ids);
+        this.$modal.confirm('是否确认删除印章编号为"' + ids + '"的数据项?').then(function() {
+            return delSeal(ids);
           }).then(() => {
             this.getList();
             this.$modal.msgSuccess("删除成功");
@@ -294,11 +294,11 @@
       /** 导出按钮操作 */
       handleExport() {
         const queryParams = this.queryParams;
-        this.$modal.confirm('是否确认导出所有岗位数据项?').then(() => {
+        this.$modal.confirm('是否确认导出所有印章数据项?').then(() => {
             this.exportLoading = true;
-            return exportPost(queryParams);
+            return exportSeal(queryParams);
           }).then(response => {
-            this.$download.excel(response, '岗位数据.xls');
+            this.$download.excel(response, '印章数据.xls');
             this.exportLoading = false;
         }).catch(() => {});
       }