From 26385c21a7eebe5a0fab0f8205c62f9f0ef552d4 Mon Sep 17 00:00:00 2001
From: sensen <1401009740@qq.com>
Date: Tue, 25 Oct 2022 17:28:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=81=8C=E4=BD=8D=E5=8F=8A=E8=AF=A6?=
=?UTF-8?q?=E6=83=85=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ProcessSuppliesStrongerList.vue | 17 ++++++---
.../ProcessSuppliesStrongerLists.vue | 30 ++++++++--------
.../modules/ProcessSuppliesStrongerForm.vue | 35 ++++++++++++-------
src/views/system/UserList.vue | 4 +--
src/views/waste/ProcessWasteList.vue | 6 ++--
src/views/waste/modules/ProcessWasteForm.vue | 12 +++----
6 files changed, 61 insertions(+), 43 deletions(-)
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index b4dfa53..41e914b 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -34,17 +34,20 @@
-
+
+
+ {{item.itemGroup}}
+
-
+
-
+
@@ -208,6 +211,7 @@
import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+
export default {
name: 'ProcessSuppliesStrongerList',
mixins:[JeecgListMixin, mixinDevice],
@@ -219,9 +223,10 @@
},
data () {
return {
- item:false,
+ // item:false,
description: '物资总库管理页面',
// 表头
+ bigId:[],
columns: [
{
title: '#',
@@ -351,7 +356,7 @@
delete: "/suppliesstronger/processSuppliesStronger/delete",
deleteBatch: "/suppliesstronger/processSuppliesStronger/deleteBatch",
exportXlsUrl: "/suppliesstronger/processSuppliesStronger/exportXls",
- importExcelUrl: "suppliesstronger/processSuppliesStronger/importExcel",
+ importExcelUrl: "/suppliesstronger/processSuppliesStronger/importExcel",
},
dictOptions:{},
@@ -399,6 +404,8 @@
fieldList.push({type:'sel_search',value:'librarySign',text:'入库人',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
this.superFieldList = fieldList
+
+
}
}
}
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
index 056c3bc..bb81ab6 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
@@ -23,21 +23,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue b/src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
index 4328175..c7cb6c8 100644
--- a/src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
+++ b/src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
@@ -5,12 +5,12 @@
-
+
-
+
@@ -20,7 +20,11 @@
-
+
+
+
+ {{item.itemGroup}}
+
@@ -40,27 +44,27 @@
-
+
-
+
-
+
-
+
-
+
@@ -75,12 +79,15 @@
-
+
-
+
+
+ {{item.arrivalNotice}}
+
@@ -90,12 +97,15 @@
-
+
+
+ {{item.librarySign}}
+
-
+
@@ -148,6 +158,7 @@
return {
form: this.$form.createForm(this),
model: {},
+ bigId:[],
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 1071282..29c4ac1 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -258,10 +258,10 @@
dataIndex: 'orgCodeTxt'
},
{
- title: '负责部门',
+ title: '职位',
align: "center",
width: 180,
- dataIndex: 'departIds_dictText'
+ dataIndex: 'post'
},
{
title: '状态',
diff --git a/src/views/waste/ProcessWasteList.vue b/src/views/waste/ProcessWasteList.vue
index 792aeb6..7cd5a30 100644
--- a/src/views/waste/ProcessWasteList.vue
+++ b/src/views/waste/ProcessWasteList.vue
@@ -6,7 +6,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
@@ -216,7 +216,7 @@
dataIndex: 'brand'
},
{
- title:'名称',
+ title:'物资名称',
align:"center",
dataIndex: 'materialName'
},
diff --git a/src/views/waste/modules/ProcessWasteForm.vue b/src/views/waste/modules/ProcessWasteForm.vue
index 5700a7a..e60204a 100644
--- a/src/views/waste/modules/ProcessWasteForm.vue
+++ b/src/views/waste/modules/ProcessWasteForm.vue
@@ -5,12 +5,12 @@
-
+
-
+
@@ -20,7 +20,7 @@
-
+
@@ -30,7 +30,7 @@
-
+
@@ -40,7 +40,7 @@
-
+
@@ -50,7 +50,7 @@
-
+
From ccf9bd97b3bc1fa40834fc0389cddd640c45d957 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Tue, 25 Oct 2022 18:09:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E5=A1=AB=E9=80=89=E7=99=BB=E5=BD=95=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/manage.js | 10 +++++
src/components/jeecgbiz/JSelectUserByDep.vue | 33 ++++++++---------
src/store/modules/user.js | 8 +++-
src/store/mutation-types.js | 2 +
.../form/ProcessMaterialBorrowingForm.vue | 33 +++++++++++++----
.../form/ProcessMaterialWarehousingForm.vue | 33 +++++++++++++----
.../form/ProcessMaterialsAllotForm.vue | 33 +++++++++++++----
.../form/ProcessMaterialsDeliveryForm.vue | 35 +++++++++++++-----
.../form/ProcessMaterialsReturnForm.vue | 35 +++++++++++++-----
.../form/ProcessSmaterialsScrapForm.vue | 35 +++++++++++++-----
.../form/ProcessSpecialMaterialsForm.vue | 33 +++++++++++++----
.../activiti/form/ProcessUdgetPlanForm.vue | 37 ++++++++++++++-----
.../modules/ProcessSmaterialsScrapForm.vue | 2 +-
.../modules/ProcessSmaterialsScrapModal.vue | 10 ++---
14 files changed, 247 insertions(+), 92 deletions(-)
diff --git a/src/api/manage.js b/src/api/manage.js
index d2e08de..b017b86 100644
--- a/src/api/manage.js
+++ b/src/api/manage.js
@@ -191,3 +191,13 @@ export function getFileAccessHttpUrl(avatar,subStr) {
return;
}
}
+
+export function getCurrentTime() {
+ let yy = new Date().getFullYear();
+ let mm = new Date().getMonth()+1;
+ let dd = new Date().getDate();
+ let hh = new Date().getHours();
+ let mf = new Date().getMinutes()<10 ? '0'+new Date().getMinutes() : new Date().getMinutes();
+ let ss = new Date().getSeconds()<10 ? '0'+new Date().getSeconds() : new Date().getSeconds();
+ return yy+'-'+mm+'-'+dd+' '+hh+':'+mf+':'+ss;
+}
diff --git a/src/components/jeecgbiz/JSelectUserByDep.vue b/src/components/jeecgbiz/JSelectUserByDep.vue
index efeed98..5d8f44a 100644
--- a/src/components/jeecgbiz/JSelectUserByDep.vue
+++ b/src/components/jeecgbiz/JSelectUserByDep.vue
@@ -44,10 +44,10 @@
return {
userIds: "",
userNames: "",
- //部门
- orgCodeTxt:"",
- //部门id
- id:""
+ // //部门
+ // orgCodeTxt:"",
+ // //部门id
+ // id:""
}
},
mounted() {
@@ -81,22 +81,21 @@
temp += ',' + item.realname
}
- let demp = ''
- for (let item of rows) {
- demp += ',' + item.orgCodeTxt
- }
- let idmp = ''
- for (let item of rows) {
- idmp += ',' + item.id
- }
+ // let demp = ''
+ // for (let item of rows) {
+ // demp += ',' + item.orgCodeTxt
+ // }
+ // let idmp = ''
+ // for (let item of rows) {
+ // idmp += ',' + item.id
+ // }
this.userNames = temp.substring(1)
this.userIds = idstr
- this.orgCodeTxt = demp.substring(1)
- this.id = idmp.substring(1)
- // console.log("当前选中用户部门", this.orgCodeTxt)
- // console.log("当前选中用户部门Id", this.id)
+ // this.orgCodeTxt = demp.substring(1)
+ // this.id = idmp.substring(1)
+
}
- this.$emit('orgCodeTxt',this.orgCodeTxt)
+ // this.$emit("orgCodeTxt",this.orgCodeTxt,this.id)
this.$emit("change", this.userIds)
}
}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index fdceea5..677e967 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,9 +1,10 @@
import Vue from 'vue'
import { login, logout, phoneLogin, thirdLogin } from "@/api/login"
-import { ACCESS_TOKEN, USER_NAME,USER_INFO,USER_AUTH,SYS_BUTTON_AUTH,UI_CACHE_DB_DICT_DATA,TENANT_ID,CACHE_INCLUDED_ROUTES } from "@/store/mutation-types"
+import { ACCESS_TOKEN, USER_NAME,USER_INFO,USER_AUTH,SYS_BUTTON_AUTH,UI_CACHE_DB_DICT_DATA,TENANT_ID,CACHE_INCLUDED_ROUTES,PARENT_ID,USER_INFORMATION } from "@/store/mutation-types"
import { welcome } from "@/utils/util"
import { queryPermissionsByUser } from '@/api/api'
import { getAction } from '@/api/manage'
+import { console } from 'vuedraggable/src/util/helper'
const user = {
state: {
@@ -120,9 +121,14 @@ const user = {
const menuData = response.result.menu;
const authData = response.result.auth;
const allAuthData = response.result.allAuth;
+ const parentId=response.result.parentId;
+ const userInformation=response.result.userInfo;
+ console.log('------>登录后的信息',response)
//Vue.ls.set(USER_AUTH,authData);
sessionStorage.setItem(USER_AUTH,JSON.stringify(authData));
sessionStorage.setItem(SYS_BUTTON_AUTH,JSON.stringify(allAuthData));
+ sessionStorage.setItem(PARENT_ID,parentId);
+ sessionStorage.setItem(USER_INFORMATION,JSON.stringify(userInformation));
if (menuData && menuData.length > 0) {
//update--begin--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
menuData.forEach((item, index) => {
diff --git a/src/store/mutation-types.js b/src/store/mutation-types.js
index 631ec5c..8dbc1fa 100644
--- a/src/store/mutation-types.js
+++ b/src/store/mutation-types.js
@@ -12,6 +12,8 @@ export const DEFAULT_MULTI_PAGE = 'DEFAULT_MULTI_PAGE'
export const USER_NAME = 'Login_Username'
export const USER_INFO = 'Login_Userinfo'
export const USER_AUTH = 'LOGIN_USER_BUTTON_AUTH'
+export const PARENT_ID='PARENT_ID'
+export const USER_INFORMATION='USER_INFORMATION'
export const SYS_BUTTON_AUTH = 'SYS_BUTTON_AUTH'
export const ENCRYPTED_STRING = 'ENCRYPTED_STRING'
export const ENHANCE_PRE = 'enhance_'
diff --git a/src/views/activiti/form/ProcessMaterialBorrowingForm.vue b/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
index 3713d25..d2b44a3 100644
--- a/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
@@ -11,22 +11,22 @@
-
+
-
+
-
+
-
+
@@ -78,7 +78,7 @@
\ No newline at end of file