sunlupeng 1 rok pred
rodič
commit
06a2b7705a

+ 1 - 1
src/api/stamp/list.js

@@ -29,7 +29,7 @@ export function getStamp(StampId) {
 export function addStamp(data) {
   return request({
     url: '/bpm/oa-stamp-info/create',
-    method: 'Stamp',
+    method: 'post',
     data: data
   })
 }

+ 1 - 1
src/api/stamp/sealList.js

@@ -29,7 +29,7 @@ export function getSeal(SealId) {
 export function addSeal(data) {
   return request({
     url: '/bpm/oa-stamp-seal/create',
-    method: 'Seal',
+    method: 'post',
     data: data
   })
 }

+ 1 - 1
src/views/meeting/reserveList/index.vue

@@ -203,7 +203,7 @@ export default {
     PeopleSelect,
   },
   computed: {
-  userInfo() {
+    userInfo() {
       return JSON.parse(this.$store.getters.userInfo);
     }
   },

+ 3 - 6
src/views/oa/expense/edit.vue

@@ -164,7 +164,6 @@
 <script>
 import {typeList,listByExpenseTypeId, getDetail, create, reCommit, save, deleteById, closeById } from "@/api/oa/expense"
 import { getDate } from "@/utils/dateUtils";
-import { getUserProfile } from "@/api/system/user";
 import { listDept } from "@/api/system/dept";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
 import Treeselect from "@riophae/vue-treeselect";
@@ -316,13 +315,11 @@ export default {
       return getDate(ms);
     },
     getUser() {
-      getUserProfile().then(response => {
-        let userInfo = response.data;
+      let userInfo = JSON.parse(this.$store.getters.userInfo);
         this.form.employeeName = userInfo.nickname;
-        this.form.deptName = userInfo.dept.name;
-        this.form.position = userInfo.posts[0].name;
+        this.form.deptName = userInfo.deptName;
+        this.form.position = userInfo.position;
         this.form.employeePhone = userInfo.mobile;
-      });
     },
     handleRemove(file, fileList) {
       console.log(file, fileList);

+ 3 - 6
src/views/oa/leave/edit.vue

@@ -127,7 +127,6 @@
 <script>
 import { getDetail, create, reCommit, save, deleteById, closeById } from "@/api/oa/leave"
 import { getDate } from "@/utils/dateUtils";
-import { getUserProfile } from "@/api/system/user";
 import { listDept } from "@/api/system/dept";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
 import Treeselect from "@riophae/vue-treeselect";
@@ -276,13 +275,11 @@ export default {
       return getDate(ms);
     },
     getUser() {
-      getUserProfile().then(response => {
-        let userInfo = response.data;
+      let userInfo = JSON.parse(this.$store.getters.userInfo);
         this.form.employeeName = userInfo.nickname;
-        this.form.deptName = userInfo.dept.name;
-        this.form.position = userInfo.posts[0].name;
+        this.form.deptName = userInfo.deptName;
+        this.form.position = userInfo.position;
         this.form.employeePhone = userInfo.mobile;
-      });
     },
     handleRemove(file, fileList) {
       console.log(file, fileList);

+ 3 - 6
src/views/oa/out/edit.vue

@@ -103,7 +103,6 @@
 <script>
 import { getDetail, create, reCommit, save, deleteById, closeById } from "@/api/oa/out"
 import { getDate } from "@/utils/dateUtils";
-import { getUserProfile } from "@/api/system/user";
 import { listDept } from "@/api/system/dept";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
 import Treeselect from "@riophae/vue-treeselect";
@@ -240,13 +239,11 @@ export default {
       return getDate(ms);
     },
     getUser() {
-      getUserProfile().then(response => {
-        let userInfo = response.data;
+      let userInfo = JSON.parse(this.$store.getters.userInfo);
         this.form.employeeName = userInfo.nickname;
-        this.form.deptName = userInfo.dept.name;
-        this.form.position = userInfo.posts[0].name;
+        this.form.deptName = userInfo.deptName;
+        this.form.position = userInfo.position;
         this.form.employeePhone = userInfo.mobile;
-      });
     },
     handleRemove(file, fileList) {
       console.log(file, fileList);

+ 3 - 6
src/views/oa/purchase/edit.vue

@@ -139,7 +139,6 @@
 <script>
 import { getDetail, create, reCommit, save, deleteById, closeById } from "@/api/oa/purchase"
 import { getDate } from "@/utils/dateUtils";
-import { getUserProfile } from "@/api/system/user";
 import { listDept } from "@/api/system/dept";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
 import Treeselect from "@riophae/vue-treeselect";
@@ -261,13 +260,11 @@ export default {
       return getDate(ms);
     },
     getUser() {
-      getUserProfile().then(response => {
-        let userInfo = response.data;
+      let userInfo = JSON.parse(this.$store.getters.userInfo);
         this.form.employeeName = userInfo.nickname;
-        this.form.deptName = userInfo.dept.name;
-        this.form.position = userInfo.posts[0].name;
+        this.form.deptName = userInfo.deptName;
+        this.form.position = userInfo.position;
         this.form.employeePhone = userInfo.mobile;
-      });
     },
     handleRemove(file, fileList) {
       console.log(file, fileList);

+ 3 - 6
src/views/oa/receive/edit.vue

@@ -137,7 +137,6 @@
 <script>
 import { getDetail, create, reCommit, save, deleteById, closeById } from "@/api/oa/receive"
 import { getDate } from "@/utils/dateUtils";
-import { getUserProfile } from "@/api/system/user";
 import { listDept } from "@/api/system/dept";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
 import Treeselect from "@riophae/vue-treeselect";
@@ -249,13 +248,11 @@ export default {
       return getDate(ms);
     },
     getUser() {
-      getUserProfile().then(response => {
-        let userInfo = response.data;
+      let userInfo = JSON.parse(this.$store.getters.userInfo);
         this.form.employeeName = userInfo.nickname;
-        this.form.deptName = userInfo.dept.name;
-        this.form.position = userInfo.posts[0].name;
+        this.form.deptName = userInfo.deptName;
+        this.form.position = userInfo.position;
         this.form.employeePhone = userInfo.mobile;
-      });
     },
     handleRemove(file, fileList) {
       console.log(file, fileList);

+ 3 - 6
src/views/oa/stamp/edit.vue

@@ -95,7 +95,6 @@
 <script>
 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";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
 import Treeselect from "@riophae/vue-treeselect";
@@ -200,13 +199,11 @@ export default {
       return getDate(ms);
     },
     getUser() {
-      getUserProfile().then(response => {
-        let userInfo = response.data;
+      let userInfo = JSON.parse(this.$store.getters.userInfo);
         this.form.employeeName = userInfo.nickname;
-        this.form.deptName = userInfo.dept.name;
-        this.form.position = userInfo.posts[0].name;
+        this.form.deptName = userInfo.deptName;
+        this.form.position = userInfo.position;
         this.form.employeePhone = userInfo.mobile;
-      });
     },
     handleRemove(file, fileList) {
       console.log(file, fileList);

+ 3 - 6
src/views/oa/universal/edit.vue

@@ -90,7 +90,6 @@
 <script>
 import { getDetail, create,reCommit, save, deleteById,closeById } from "@/api/oa/universal"
 import {getDate} from "@/utils/dateUtils";
-import { getUserProfile } from "@/api/system/user";
 import { listDept } from "@/api/system/dept";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
 import Treeselect from "@riophae/vue-treeselect";
@@ -180,13 +179,11 @@ export default {
       return getDate(ms);
     },
     getUser() {
-      getUserProfile().then(response => {
-        let userInfo = response.data;
+        let userInfo = JSON.parse(this.$store.getters.userInfo);
         this.form.employeeName = userInfo.nickname;
-        this.form.deptName = userInfo.dept.name;
-        this.form.position = userInfo.posts[0].name;
+        this.form.deptName = userInfo.deptName;
+        this.form.position = userInfo.position;
         this.form.employeePhone = userInfo.mobile;
-      });
     },
     handleRemove(file, fileList) {
       console.log(file, fileList);

+ 14 - 4
src/views/stamp/list/index.vue

@@ -23,13 +23,13 @@
         <el-input v-model="queryParams.stampTitle" placeholder="请输入用印标题" clearable style="width: 250px"
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <!-- <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> -->
       <el-form-item label="数据来源" prop="infoSource">
         <el-select v-model="queryParams.infoSource" placeholder="数据来源" clearable style="width: 250px">
           <el-option label="流程添加" value="0"/>
@@ -66,11 +66,11 @@
       <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="createEmployeeName" min-width="100" />
-      <el-table-column label="状态" align="center" prop="status">
+      <!-- <el-table-column label="状态" align="center" prop="status">
         <template v-slot="scope">
          <span>{{ scope.row.status == 0 ? '已完成' : scope.row.status == 1 ? '已作废' : '已生效'}}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="数据来源" align="center" prop="infoSource">
         <template v-slot="scope">
          <span>{{ scope.row.infoSource == 0 ? '流程添加' : '手动添加'}}</span>
@@ -218,6 +218,7 @@
 </template>
 
 <script>
+import { getEmployeeInfo } from "@/api/system/user";
 import { listStamp, getStamp, delStamp, addStamp, updateStamp, exportStamp } from "@/api/stamp/list";
 import { typeList } from "@/api/oa/stamp"
 import Treeselect from "@riophae/vue-treeselect";
@@ -298,6 +299,14 @@ export default {
     this.getTypeList();
   },
   methods: {
+    getEmployee() {
+      getEmployeeInfo(this.form.employeeId).then(response => {
+        let employeeInfo = response.data;
+        this.form.deptName = employeeInfo.deptName;
+        this.form.position = employeeInfo.position;
+        this.form.employeePhone = employeeInfo.phone;
+      });
+    },
      // 类型信息列表
      getTypeList(){
       typeList().then(
@@ -331,6 +340,7 @@ export default {
       console.log(userNamelist);
       this.form.employeeName = nikeNamelist.join();
       this.form.employeeId = userIdList.join();
+      this.getEmployee();
       this.singlePeopleOpen = false;
     },
     /** 查询岗位列表 */