From bde6c87a144eda0d26364db8169c9460c8710276 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 23 五月 2024 01:24:18 +0800
Subject: [PATCH] 实现人员明细
---
src/components/view/b2-standard.vue | 8
src/components/view/a6-personnel-detail.vue | 47 ++++++-
src/App.vue | 4
src/components/view/person-manage.vue | 3
src/assets/api/controller.js | 298 +++++++++++++++++++++++++------------------------
5 files changed, 197 insertions(+), 163 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 500f742..b35af6c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -312,4 +312,8 @@
height: 300px;
}
+ .el-table-filter__list-item{
+ font-size: 12px;
+ line-height: 32px;
+ }
</style>
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 38aa153..edeb6d4 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -1,19 +1,19 @@
export default function(Vue) {
- //娣诲姞鍏ㄥ眬API
- Vue.prototype.$api = {
- login,
- user,
- dataReporting,
- enums,
- capacityScope,
- laboratoryScope,
- deviceScope,
- systemLog,
- standardTree,
- standardMethod,
- StandardTemplate,
- insOrder,
- sampleOrder,
+ //娣诲姞鍏ㄥ眬API
+ Vue.prototype.$api = {
+ login,
+ user,
+ dataReporting,
+ enums,
+ capacityScope,
+ laboratoryScope,
+ deviceScope,
+ systemLog,
+ standardTree,
+ standardMethod,
+ StandardTemplate,
+ insOrder,
+ sampleOrder,
insOrderPlan,
insReport,
warehouse,
@@ -24,89 +24,91 @@
informationNotification,
performanceShift,
auxiliaryWorkingHours,
- unPass,
+ unPass,
companies
- }
+ }
}
const login = {
- enter: "/user/enter", //鐧诲綍
+ enter: "/user/enter", //鐧诲綍
}
const user = {
- selectUserList: "/user/selectUserList", //鑾峰彇鐢ㄦ埛鍒楄〃
- selectPersonnelOverview: "/user/selectPersonnelOverview", // 璧勬簮瑕佹眰-浜哄憳鎬昏
- selectRoleList: "/role/selectRoleList", //鑾峰彇瑙掕壊鍒楄〃
- updateUser: "/user/updateUser", //淇敼鐢ㄦ埛淇℃伅
- addUser: "/user/addUser", //娣诲姞鐢ㄦ埛淇℃伅
- selectRoleLists: "/role/selectRoleLists", //鑾峰彇瑙掕壊鍒楄〃
- delRole: "/role/delRole", //鍒犻櫎瑙掕壊淇℃伅
- addRole: "/role/addRole", //娣诲姞瑙掕壊淇℃伅
- selectMenuList: "/role/selectMenuList", //鑾峰彇鑿滃崟
- selectPowerByRoleId: "/role/selectPowerByRoleId", //閫氳繃瑙掕壊id鏌ヨ鏉冮檺鍒楄〃
- upRole: "/role/upRole", //淇敼瑙掕壊
- getUserMenu: "/user/getUserMenu", //鑾峰彇鐢ㄦ埛鏋氫妇
- selectCustomPageList: "/user/selectCustomPageList", //鑾峰彇瀹㈡埛鍒楄〃
- delCustomById: "/user/delCustomById", //鍒犻櫎瀹㈡埛淇℃伅
- addCustom: "/user/addCustom", //鏂板瀹㈡埛淇℃伅
- getUserNow: "/user/getUserNow", //鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�
- getUserInfo: "/user/getUserInfo", //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�
- upUserPassword: "/user/upUserPassword", //淇敼鐢ㄦ埛瀵嗙爜
+ selectUserList: "/user/selectUserList", //鑾峰彇鐢ㄦ埛鍒楄〃
+ selectPersonnelOverview: "/user/selectPersonnelOverview", // 璧勬簮瑕佹眰-浜哄憳鎬昏
+ selectRoleList: "/role/selectRoleList", //鑾峰彇瑙掕壊鍒楄〃
+ updateUser: "/user/updateUser", //淇敼鐢ㄦ埛淇℃伅
+ addUser: "/user/addUser", //娣诲姞鐢ㄦ埛淇℃伅
+ selectRoleLists: "/role/selectRoleLists", //鑾峰彇瑙掕壊鍒楄〃
+ delRole: "/role/delRole", //鍒犻櫎瑙掕壊淇℃伅
+ addRole: "/role/addRole", //娣诲姞瑙掕壊淇℃伅
+ selectMenuList: "/role/selectMenuList", //鑾峰彇鑿滃崟
+ selectPowerByRoleId: "/role/selectPowerByRoleId", //閫氳繃瑙掕壊id鏌ヨ鏉冮檺鍒楄〃
+ upRole: "/role/upRole", //淇敼瑙掕壊
+ getUserMenu: "/user/getUserMenu", //鑾峰彇鐢ㄦ埛鏋氫妇
+ selectCustomPageList: "/user/selectCustomPageList", //鑾峰彇瀹㈡埛鍒楄〃
+ delCustomById: "/user/delCustomById", //鍒犻櫎瀹㈡埛淇℃伅
+ addCustom: "/user/addCustom", //鏂板瀹㈡埛淇℃伅
+ getUserNow: "/user/getUserNow", //鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�
+ getUserInfo: "/user/getUserInfo", //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�
+ upUserPassword: "/user/upUserPassword", //淇敼鐢ㄦ埛瀵嗙爜
+ upUserDepardLimsId: "/user/upUserDepardLimsId", //淇敼浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�
+ delUserDepardLimsId: "/user/delUserDepardLimsId", //鍒犻櫎浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�
}
const dataReporting = {
- selectDataReportingList: "/dataReporting/selectDataReportingList", //鑾峰彇鏁版嵁涓婃姤鍒楄〃
- upDataReporting: "/dataReporting/upDataReporting", //淇敼鏁版嵁涓婃姤
- selectProductCountDtoPageList: "/dataReporting/selectProductCountDtoPageList", //鑾峰彇椤圭洰姹囨�诲垪琛�
- selectRegistrantCountDtoPageList: "/dataReporting/selectRegistrantCountDtoPageList", //鑾峰彇鐧昏浜烘眹鎬诲垪琛�
- addDataReporting: "/dataReporting/addDataReporting", //娣诲姞鏁版嵁涓婃姤
- delDataReporting: "/dataReporting/delDataReporting", //鍒犻櫎鏁版嵁涓婃姤
- downDataReportingFile: "/dataReporting/downDataReportingFile", //瀵煎嚭鏁版嵁涓婃姤
- downProductCountFile: "/dataReporting/downProductCountFile", //瀵煎嚭椤圭洰鏁版嵁缁熻
- downRegistrantCountFile: "/dataReporting/downRegistrantCountFile", //瀵煎嚭鍛樺伐鏁版嵁缁熻
- downFansSubmitFile: "/dataReporting/downFansSubmitFile", //瀵煎嚭杩涚矇涓婃姤
- inputFansSubmitCsv: "/dataReporting/inputFansSubmitCsv", //瀵煎叆杩涚矇涓婃姤
- downFinanceSubmitFile: "/dataReporting/downFinanceSubmitFile", //瀵煎嚭璐㈠姟涓婃姤
- inputFinanceSubmitCsv: "/dataReporting/inputFinanceSubmitCsv", //瀵煎叆璐㈠姟涓婃姤
- selectDataComparisonDtoPageList: "/dataReporting/selectDataComparisonDtoPageList", //鑾峰彇鏁版嵁瀵规瘮鍒楄〃
- deleteAllData: "/dataReporting/deleteAllData", //涓�閿垹闄ゆ墍鏈夌殑鏁版嵁涓婃姤
- selectDataReportingForCreateUserNames: "/dataReporting/selectDataReportingForCreateUserNames", //鑾峰彇鏁版嵁涓婃姤鐨勭櫥璁颁汉绛涢�夐」
+ selectDataReportingList: "/dataReporting/selectDataReportingList", //鑾峰彇鏁版嵁涓婃姤鍒楄〃
+ upDataReporting: "/dataReporting/upDataReporting", //淇敼鏁版嵁涓婃姤
+ selectProductCountDtoPageList: "/dataReporting/selectProductCountDtoPageList", //鑾峰彇椤圭洰姹囨�诲垪琛�
+ selectRegistrantCountDtoPageList: "/dataReporting/selectRegistrantCountDtoPageList", //鑾峰彇鐧昏浜烘眹鎬诲垪琛�
+ addDataReporting: "/dataReporting/addDataReporting", //娣诲姞鏁版嵁涓婃姤
+ delDataReporting: "/dataReporting/delDataReporting", //鍒犻櫎鏁版嵁涓婃姤
+ downDataReportingFile: "/dataReporting/downDataReportingFile", //瀵煎嚭鏁版嵁涓婃姤
+ downProductCountFile: "/dataReporting/downProductCountFile", //瀵煎嚭椤圭洰鏁版嵁缁熻
+ downRegistrantCountFile: "/dataReporting/downRegistrantCountFile", //瀵煎嚭鍛樺伐鏁版嵁缁熻
+ downFansSubmitFile: "/dataReporting/downFansSubmitFile", //瀵煎嚭杩涚矇涓婃姤
+ inputFansSubmitCsv: "/dataReporting/inputFansSubmitCsv", //瀵煎叆杩涚矇涓婃姤
+ downFinanceSubmitFile: "/dataReporting/downFinanceSubmitFile", //瀵煎嚭璐㈠姟涓婃姤
+ inputFinanceSubmitCsv: "/dataReporting/inputFinanceSubmitCsv", //瀵煎叆璐㈠姟涓婃姤
+ selectDataComparisonDtoPageList: "/dataReporting/selectDataComparisonDtoPageList", //鑾峰彇鏁版嵁瀵规瘮鍒楄〃
+ deleteAllData: "/dataReporting/deleteAllData", //涓�閿垹闄ゆ墍鏈夌殑鏁版嵁涓婃姤
+ selectDataReportingForCreateUserNames: "/dataReporting/selectDataReportingForCreateUserNames", //鑾峰彇鏁版嵁涓婃姤鐨勭櫥璁颁汉绛涢�夐」
- selectFansSubmitList: "/dataReporting/selectFansSubmitList", //鑾峰彇杩涚矇涓婃姤鍒楄〃
- delFansSubmit: "/dataReporting/delFansSubmit", //鍒犻櫎杩涚矇涓婃姤淇℃伅
- updateFansSubmit: "/dataReporting/updateFansSubmit", //淇敼杩涚矇涓婃姤淇℃伅
- addFansSubmit: "/dataReporting/addFansSubmit", //娣诲姞杩涚矇涓婃姤淇℃伅
- selectVxs: "/dataReporting/selectVxs", //鑾峰彇杩涚矇涓殑寰俊鍙峰垪琛�
+ selectFansSubmitList: "/dataReporting/selectFansSubmitList", //鑾峰彇杩涚矇涓婃姤鍒楄〃
+ delFansSubmit: "/dataReporting/delFansSubmit", //鍒犻櫎杩涚矇涓婃姤淇℃伅
+ updateFansSubmit: "/dataReporting/updateFansSubmit", //淇敼杩涚矇涓婃姤淇℃伅
+ addFansSubmit: "/dataReporting/addFansSubmit", //娣诲姞杩涚矇涓婃姤淇℃伅
+ selectVxs: "/dataReporting/selectVxs", //鑾峰彇杩涚矇涓殑寰俊鍙峰垪琛�
- selectFinanceSubmitList: "/dataReporting/selectFinanceSubmitList", //鑾峰彇璐㈠姟涓婃姤鍒楄〃
- delFinanceSubmit: "/dataReporting/delFinanceSubmit", //鍒犻櫎璐㈠姟涓婃姤淇℃伅
- updateFinanceSubmit: "/dataReporting/updateFinanceSubmit", //淇敼璐㈠姟涓婃姤淇℃伅
- addFinanceSubmit: "/dataReporting/addFinanceSubmit", //娣诲姞璐㈠姟涓婃姤淇℃伅
+ selectFinanceSubmitList: "/dataReporting/selectFinanceSubmitList", //鑾峰彇璐㈠姟涓婃姤鍒楄〃
+ delFinanceSubmit: "/dataReporting/delFinanceSubmit", //鍒犻櫎璐㈠姟涓婃姤淇℃伅
+ updateFinanceSubmit: "/dataReporting/updateFinanceSubmit", //淇敼璐㈠姟涓婃姤淇℃伅
+ addFinanceSubmit: "/dataReporting/addFinanceSubmit", //娣诲姞璐㈠姟涓婃姤淇℃伅
- getDataList: "/dataReporting/getDataList", //鑾峰彇棣栭〉鏁版嵁
+ getDataList: "/dataReporting/getDataList", //鑾峰彇棣栭〉鏁版嵁
- inputCsv: "/dataReporting/inputCsv", //瀵煎叆
+ inputCsv: "/dataReporting/inputCsv", //瀵煎叆
}
const enums = {
- selectEnumList: "/enum/selectEnumList", //鑾峰彇鏋氫妇鍒楄〃
- addEnum: "/enum/addEnum", //娣诲姞鏋氫妇
- upEnum: "/enum/upEnum", //淇敼鏋氫妇
- delEnum: "/enum/delEnum", //鍒犻櫎鏋氫妇
- selectEnumByCategory: "/enum/selectEnumByCategory", //閫氳繃鍒嗙被鏌ヨ鏋氫妇
+ selectEnumList: "/enum/selectEnumList", //鑾峰彇鏋氫妇鍒楄〃
+ addEnum: "/enum/addEnum", //娣诲姞鏋氫妇
+ upEnum: "/enum/upEnum", //淇敼鏋氫妇
+ delEnum: "/enum/delEnum", //鍒犻櫎鏋氫妇
+ selectEnumByCategory: "/enum/selectEnumByCategory", //閫氳繃鍒嗙被鏌ヨ鏋氫妇
getDic: "/enum/getDic", //鑾峰彇鏁版嵁瀛楀吀鐨勫垎绫�
}
const capacityScope = {
- selectItemParameterList: "/capacityScope/selectItemParameterList", //鑾峰彇妫�楠岄」鐩弬鏁�
- addItemParameter: "/capacityScope/addItemParameter", //鏂板妫�楠岄」鐩弬鏁�
- delItemParameter: "/capacityScope/delItemParameter", //鍒犻櫎妫�楠岄」鐩弬鏁�
- upItemParameter: "/capacityScope/upItemParameter", //淇敼妫�楠岄」鐩弬鏁�
- selectTestObjectList: "/capacityScope/selectTestObjectList", //鑾峰彇妫�娴嬪璞�
- addTestObject: "/capacityScope/addTestObject", //鏂板妫�娴嬪璞�
- delTestObject: "/capacityScope/delTestObject", //鍒犻櫎妫�娴嬪璞�
- upTestObject: "/capacityScope/upTestObject", //淇敼妫�娴嬪璞�
- selectTestObjectByName: "/capacityScope/selectTestObjectByName", //鑾峰彇妫�楠屽璞℃灇涓�
+ selectItemParameterList: "/capacityScope/selectItemParameterList", //鑾峰彇妫�楠岄」鐩弬鏁�
+ addItemParameter: "/capacityScope/addItemParameter", //鏂板妫�楠岄」鐩弬鏁�
+ delItemParameter: "/capacityScope/delItemParameter", //鍒犻櫎妫�楠岄」鐩弬鏁�
+ upItemParameter: "/capacityScope/upItemParameter", //淇敼妫�楠岄」鐩弬鏁�
+ selectTestObjectList: "/capacityScope/selectTestObjectList", //鑾峰彇妫�娴嬪璞�
+ addTestObject: "/capacityScope/addTestObject", //鏂板妫�娴嬪璞�
+ delTestObject: "/capacityScope/delTestObject", //鍒犻櫎妫�娴嬪璞�
+ upTestObject: "/capacityScope/upTestObject", //淇敼妫�娴嬪璞�
+ selectTestObjectByName: "/capacityScope/selectTestObjectByName", //鑾峰彇妫�楠屽璞℃灇涓�
getInsProduction: "/capacityScope/getInsProduction", //璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)
selectProductListByObjectId: "/capacityScope/selectProductListByObjectId", //缁存姢妫�楠屽璞＄殑浜у搧
addProduct: "/capacityScope/addProduct", //鏂板浜у搧
@@ -116,93 +118,93 @@
}
const laboratoryScope = {
- selectItemParameter: "/laboratoryScope/selectItemParameter", //鏌ヨ瀹為獙瀹ょ鐞嗗垪琛�
- addParameter: "/laboratoryScope/addParameter", //娣诲姞瀹為獙瀹ゅ弬鏁�
- delParameter: "/laboratoryScope/delParameter", //鍒犻櫎瀹為獙瀹ゅ弬鏁�
- upParameter: "/laboratoryScope/upParameter", //淇敼瀹為獙瀹ゅ弬鏁�
- obtainItemParameterList: "/laboratoryScope/obtainItemParameterList", //鑾峰彇瀹為獙瀹ゅ悕绉�
+ selectItemParameter: "/laboratoryScope/selectItemParameter", //鏌ヨ瀹為獙瀹ょ鐞嗗垪琛�
+ addParameter: "/laboratoryScope/addParameter", //娣诲姞瀹為獙瀹ゅ弬鏁�
+ delParameter: "/laboratoryScope/delParameter", //鍒犻櫎瀹為獙瀹ゅ弬鏁�
+ upParameter: "/laboratoryScope/upParameter", //淇敼瀹為獙瀹ゅ弬鏁�
+ obtainItemParameterList: "/laboratoryScope/obtainItemParameterList", //鑾峰彇瀹為獙瀹ゅ悕绉�
}
const deviceScope = {
- selectDeviceParameter: "/deviceScope/selectDeviceParameter", //鏌ヨ璁惧璇︽儏鍒楄〃
- addDeviceParameter: "/deviceScope/addDeviceParameter", //娣诲姞璁惧璇︽儏鍙傛暟
- delDeviceParameter: "/deviceScope/delDeviceParameter", //鍒犻櫎璁惧璇︽儏鍙傛暟
- upDeviceParameter: "/deviceScope/upDeviceParameter", //淇敼璁惧璇︽儏鍙傛暟
+ selectDeviceParameter: "/deviceScope/selectDeviceParameter", //鏌ヨ璁惧璇︽儏鍒楄〃
+ addDeviceParameter: "/deviceScope/addDeviceParameter", //娣诲姞璁惧璇︽儏鍙傛暟
+ delDeviceParameter: "/deviceScope/delDeviceParameter", //鍒犻櫎璁惧璇︽儏鍙傛暟
+ upDeviceParameter: "/deviceScope/upDeviceParameter", //淇敼璁惧璇︽儏鍙傛暟
selectDeviceByCategory: "/deviceScope/selectDeviceByCategory", //閫氳繃璁惧鍒嗙被鑾峰彇璁惧鍒楄〃
- authorizedPerson: "/user/getDeviceManager", //鑾峰彇鎺堟潈浜�
- selectEquipmentOverview: "/deviceScope/selectEquipmentOverview", //鑾峰彇璁惧鎬昏
- uploadFile: "/deviceScope/uploadFile", //涓婁紶鍥剧墖
- selectDevicePrincipal: "/user/getDeviceManager", //鑾峰彇璁惧璐熻矗浜�
+ authorizedPerson: "/user/getDeviceManager", //鑾峰彇鎺堟潈浜�
+ selectEquipmentOverview: "/deviceScope/selectEquipmentOverview", //鑾峰彇璁惧鎬昏
+ uploadFile: "/deviceScope/uploadFile", //涓婁紶鍥剧墖
+ selectDevicePrincipal: "/user/getDeviceManager", //鑾峰彇璁惧璐熻矗浜�
selectDeviceByCode: "/deviceScope/selectDeviceByCode", //閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃
}
const insOrder = {
- selectInsOrderParameter: "/insOrder/selectInsOrderParameter", //鏌ヨ妫�楠屼笅鍗�
- addInsOrder: "/insOrder/addInsOrder", //娣诲姞妫�楠屼笅鍗曟暟鎹�
- selectOrderManDay: "/insOrder/selectOrderManDay", //鏌ヨ璁㈠崟鎬诲叡棰勮鏃堕棿
- upInsOrder: "/insOrder/upInsOrder", //妫�楠屼笅鍙�
+ selectInsOrderParameter: "/insOrder/selectInsOrderParameter", //鏌ヨ妫�楠屼笅鍗�
+ addInsOrder: "/insOrder/addInsOrder", //娣诲姞妫�楠屼笅鍗曟暟鎹�
+ selectOrderManDay: "/insOrder/selectOrderManDay", //鏌ヨ璁㈠崟鎬诲叡棰勮鏃堕棿
+ upInsOrder: "/insOrder/upInsOrder", //妫�楠屼笅鍙�
getInsOrder: "/insOrder/getInsOrder", //鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�
upInsOrderOfState: "/insOrder/upInsOrderOfState", //瀹℃牳妫�楠屽崟鏈鸿繘琛岀姸鎬佷慨鏀�
addInsOrderTemplate: "/insOrder/addInsOrderTemplate", //娣诲姞妫�楠屽崟妯℃澘
selectInsOrderTemplate: "/insOrder/selectInsOrderTemplate", //鏌ヨ妫�楠屽崟妯℃澘
selectInsOrderTemplateById: "/insOrder/selectInsOrderTemplateById", //閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭
delInsOrderTemplate: "/insOrder/delInsOrderTemplate", //鍒犻櫎妫�楠屽崟妯℃澘
- selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�
- costStatistics: "/insOrder/costStatistics", //璐圭敤缁熻
+ selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�
+ costStatistics: "/insOrder/costStatistics", //璐圭敤缁熻
selectSampleDefects: "/insOrder/selectSampleDefects", //鏍峰搧缂洪櫡鎸囨爣
}
const sampleOrder = {
- list: "/sampleOrder/list", //鑾峰彇鎸囨淳浜哄憳
+ list: "/sampleOrder/list", //鑾峰彇鎸囨淳浜哄憳
}
const insOrderPlan = {
- selectInsOrderPlanList: "/insOrderPlan/selectInsOrderPlanList", //鏌ヨ妫�楠屼换鍔�
- claimInsOrderPlan: "/insOrderPlan/claimInsOrderPlan",//璁ら妫�楠屼换鍔�
- doInsOrder: "/insOrderPlan/doInsOrder",//鎵ц妫�楠屾搷浣�
- saveInsContext: "/insOrderPlan/saveInsContext",//淇濆瓨妫�楠屽唴瀹�
- upPlanUser: "/insOrderPlan/upPlanUser",//浠诲姟浜ゆ帴
- verifyPlan: "/insOrderPlan/verifyPlan",//澶嶆牳妫�楠屼换鍔�
- submitPlan: "/insOrderPlan/submitPlan",//妫�楠屼换鍔℃彁浜�
+ selectInsOrderPlanList: "/insOrderPlan/selectInsOrderPlanList", //鏌ヨ妫�楠屼换鍔�
+ claimInsOrderPlan: "/insOrderPlan/claimInsOrderPlan", //璁ら妫�楠屼换鍔�
+ doInsOrder: "/insOrderPlan/doInsOrder", //鎵ц妫�楠屾搷浣�
+ saveInsContext: "/insOrderPlan/saveInsContext", //淇濆瓨妫�楠屽唴瀹�
+ upPlanUser: "/insOrderPlan/upPlanUser", //浠诲姟浜ゆ帴
+ verifyPlan: "/insOrderPlan/verifyPlan", //澶嶆牳妫�楠屼换鍔�
+ submitPlan: "/insOrderPlan/submitPlan", //妫�楠屼换鍔℃彁浜�
}
const systemLog = {
- selectSystemLogList: "/systemLog/selectSystemLogList", //鑾峰彇鏃ュ織
+ selectSystemLogList: "/systemLog/selectSystemLogList", //鑾峰彇鏃ュ織
}
const standardTree = {
- selectStandardTreeList: "/standardTree/selectStandardTreeList", //鑾峰彇鏍囧噯鏍�
- addStandardTree: "/standardTree/addStandardTree", //娣诲姞鏍囧噯鏍�
- addStandardMethodList: "/standardTree/addStandardMethodList", //缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�
- selectsStandardMethodByFLSSM: "/standardTree/selectsStandardMethodByFLSSM", //鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�
- upStandardProductList: "/standardTree/upStandardProductList", //淇敼鏍囧噯搴撲腑鐨勮姹傚��
- delStandardMethodByFLSSM: "/standardTree/delStandardMethodByFLSSM", //鍒犻櫎鏍囧噯鏍戜笅鐨勬楠屾爣鍑�
- delStandardProductByIds: "/standardTree/delStandardProductByIds", //鍒犻櫎鏍囧噯鏍戜笅鐨勬楠岄」鐩�
- addStandardProduct: "/standardTree/addStandardProduct", //鏂板鏍囧噯鏍戜笅鐨勬楠岄」鐩�
- delStandardTree: "/standardTree/delStandardTree", //鍒犻櫎鏍囧噯鏍戠殑灞傜骇
- selectStandardProductList: "/standardTree/selectStandardProductList", //閫氳繃鏍囧噯鏍戞煡璇㈠搴旂殑妫�楠岄」鐩�
- selectStandardProductListByMethodId: "/standardTree/selectStandardProductListByMethodId", //閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�
+ selectStandardTreeList: "/standardTree/selectStandardTreeList", //鑾峰彇鏍囧噯鏍�
+ addStandardTree: "/standardTree/addStandardTree", //娣诲姞鏍囧噯鏍�
+ addStandardMethodList: "/standardTree/addStandardMethodList", //缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�
+ selectsStandardMethodByFLSSM: "/standardTree/selectsStandardMethodByFLSSM", //鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�
+ upStandardProductList: "/standardTree/upStandardProductList", //淇敼鏍囧噯搴撲腑鐨勮姹傚��
+ delStandardMethodByFLSSM: "/standardTree/delStandardMethodByFLSSM", //鍒犻櫎鏍囧噯鏍戜笅鐨勬楠屾爣鍑�
+ delStandardProductByIds: "/standardTree/delStandardProductByIds", //鍒犻櫎鏍囧噯鏍戜笅鐨勬楠岄」鐩�
+ addStandardProduct: "/standardTree/addStandardProduct", //鏂板鏍囧噯鏍戜笅鐨勬楠岄」鐩�
+ delStandardTree: "/standardTree/delStandardTree", //鍒犻櫎鏍囧噯鏍戠殑灞傜骇
+ selectStandardProductList: "/standardTree/selectStandardProductList", //閫氳繃鏍囧噯鏍戞煡璇㈠搴旂殑妫�楠岄」鐩�
+ selectStandardProductListByMethodId: "/standardTree/selectStandardProductListByMethodId", //閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�
selectStandardProductByMethodId: "/standardTree/selectStandardProductByMethodId", //鎵归噺缂栬緫鏌ヨ妫�楠岄」鐩�
- selectStandardMethodEnum: "/standardTree/selectStandardMethodEnum", //鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇
+ selectStandardMethodEnum: "/standardTree/selectStandardMethodEnum", //鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇
getStandardTree2: "/standardTree/getStandardTree2", //鑾峰彇浜у搧鏋舵瀯
upStandardProducts: "/standardTree/upStandardProducts", //鑾峰彇浜у搧鏋舵瀯
selectStandardProductEnumByMethodId: "/standardTree/selectStandardProductEnumByMethodId", //鎵归噺缂栬緫鏌ヨ鎵�鏈夋楠岄」鐩拰妫�楠屽瓙椤规灇涓�
}
const standardMethod = {
- selectStandardMethodList: "/standardMethod/selectStandardMethodList", //鑾峰彇鏍囧噯鏂规硶鍒楄〃
- selectStandardMethods: "/standardMethod/selectStandardMethods", //鑾峰彇鏍囧噯鏂规硶鏋氫妇
- addStandardMethod: "/standardMethod/addStandardMethod", //娣诲姞鏍囧噯鏂规硶
- upStandardMethod: "/standardMethod/upStandardMethod", //淇敼鏍囧噯鏂规硶
- delStandardMethod: "/standardMethod/delStandardMethod", //鍒犻櫎鏍囧噯鏂规硶
+ selectStandardMethodList: "/standardMethod/selectStandardMethodList", //鑾峰彇鏍囧噯鏂规硶鍒楄〃
+ selectStandardMethods: "/standardMethod/selectStandardMethods", //鑾峰彇鏍囧噯鏂规硶鏋氫妇
+ addStandardMethod: "/standardMethod/addStandardMethod", //娣诲姞鏍囧噯鏂规硶
+ upStandardMethod: "/standardMethod/upStandardMethod", //淇敼鏍囧噯鏂规硶
+ delStandardMethod: "/standardMethod/delStandardMethod", //鍒犻櫎鏍囧噯鏂规硶
}
const StandardTemplate = {
- selectStandardTemplatePageList: "/StandardTemplate/selectStandardTemplatePageList", //鑾峰彇妫�楠屾ā鏉垮垪琛�
- addStandardTemplate: "/StandardTemplate/addStandardTemplate", //娣诲姞妫�楠屾ā鏉�
- upStandardTemplate: "/StandardTemplate/upStandardTemplate", //淇敼妫�楠屾ā鏉�
- delStandardTemplate: "/StandardTemplate/delStandardTemplate", //鍒犻櫎妫�楠屾ā鏉�
- getStandardTemplate: "/StandardTemplate/getStandardTemplate", //鏌ヨ鍘熷璁板綍妯℃澘鏋氫妇
+ selectStandardTemplatePageList: "/StandardTemplate/selectStandardTemplatePageList", //鑾峰彇妫�楠屾ā鏉垮垪琛�
+ addStandardTemplate: "/StandardTemplate/addStandardTemplate", //娣诲姞妫�楠屾ā鏉�
+ upStandardTemplate: "/StandardTemplate/upStandardTemplate", //淇敼妫�楠屾ā鏉�
+ delStandardTemplate: "/StandardTemplate/delStandardTemplate", //鍒犻櫎妫�楠屾ā鏉�
+ getStandardTemplate: "/StandardTemplate/getStandardTemplate", //鏌ヨ鍘熷璁板綍妯℃澘鏋氫妇
}
const insReport = {
@@ -247,42 +249,42 @@
testProductByDay: "/report/testProductByDay", //棣栨娴嬮」鐩粺璁�
}
const certification = {
- getCertificationDetail:"/certification/getCertificationDetail",//鏌ヨ璧勮川鏄庣粏鍒楄〃
- addCertificationDetail:"/certification/addCertificationDetail",//娣诲姞璧勮川鏄庣粏鍒楄〃
- delCertificationDetail:"certification/delCertificationDetail",//鍒犻櫎璧勮川鏄庣粏鍒楄〃
+ getCertificationDetail: "/certification/getCertificationDetail", //鏌ヨ璧勮川鏄庣粏鍒楄〃
+ addCertificationDetail: "/certification/addCertificationDetail", //娣诲姞璧勮川鏄庣粏鍒楄〃
+ delCertificationDetail: "certification/delCertificationDetail", //鍒犻櫎璧勮川鏄庣粏鍒楄〃
}
const sealScope = {
- selectSeal:"/sealScope/selectSeal",//鏌ヨ鍗扮珷鍒楄〃
- addSeal:"/sealScope/addSeal",//娣诲姞鍗扮珷鍙傛暟
+ selectSeal: "/sealScope/selectSeal", //鏌ヨ鍗扮珷鍒楄〃
+ addSeal: "/sealScope/addSeal", //娣诲姞鍗扮珷鍙傛暟
}
const informationNotification = {
- checkForUnreadData:"/informationNotification/checkForUnreadData",//鏌ヨ鏄惁瀛樺湪鏈鏁版嵁
- deleteDataBasedOnId:"/informationNotification/deleteDataBasedOnId",//鏍规嵁Id鍒犻櫎鏁版嵁
- informationReadOrDelete:"/informationNotification/informationReadOrDelete",//鏍囪鎵�鏈変俊鎭负宸茶-鍒犻櫎鎵�鏈夊凡璇绘秷鎭�
- page:"/informationNotification/page",//婊氬姩鍒嗛〉鏌ヨ
- updateMessageStatus:"/informationNotification/updateMessageStatus",//鏇存柊娑堟伅鐘舵�侊紙鎷掔粷銆佹帴鏀讹級
- triggerModificationStatusToRead:"/informationNotification/triggerModificationStatusToRead",//鐐瑰嚮璇︽儏瑙﹀彂淇敼鐘舵�佷负宸茶
+ checkForUnreadData: "/informationNotification/checkForUnreadData", //鏌ヨ鏄惁瀛樺湪鏈鏁版嵁
+ deleteDataBasedOnId: "/informationNotification/deleteDataBasedOnId", //鏍规嵁Id鍒犻櫎鏁版嵁
+ informationReadOrDelete: "/informationNotification/informationReadOrDelete", //鏍囪鎵�鏈変俊鎭负宸茶-鍒犻櫎鎵�鏈夊凡璇绘秷鎭�
+ page: "/informationNotification/page", //婊氬姩鍒嗛〉鏌ヨ
+ updateMessageStatus: "/informationNotification/updateMessageStatus", //鏇存柊娑堟伅鐘舵�侊紙鎷掔粷銆佹帴鏀讹級
+ triggerModificationStatusToRead: "/informationNotification/triggerModificationStatusToRead", //鐐瑰嚮璇︽儏瑙﹀彂淇敼鐘舵�佷负宸茶
}
const performanceShift = {
- add:"/performanceShift/add",//缁╂晥绠＄悊-鐝-鎺掔彮
- page:"/performanceShift/page",//缁╂晥绠＄悊-鐝-鍒嗛〉鏌ヨ
- update:"/performanceShift/update",//缁╂晥绠＄悊-鐝-鐝鐘舵�佷慨鏀�
- pageYear:"/performanceShift/pageYear",//缁╂晥绠＄悊-鐝-骞翠唤鍒嗛〉鏌ヨ
- export:"/performanceShift/export",//缁╂晥绠＄悊-鐝-瀵煎嚭
+ add: "/performanceShift/add", //缁╂晥绠＄悊-鐝-鎺掔彮
+ page: "/performanceShift/page", //缁╂晥绠＄悊-鐝-鍒嗛〉鏌ヨ
+ update: "/performanceShift/update", //缁╂晥绠＄悊-鐝-鐝鐘舵�佷慨鏀�
+ pageYear: "/performanceShift/pageYear", //缁╂晥绠＄悊-鐝-骞翠唤鍒嗛〉鏌ヨ
+ export: "/performanceShift/export", //缁╂晥绠＄悊-鐝-瀵煎嚭
}
const auxiliaryWorkingHours = {
- selectAuxiliaryWorkingHours:"/auxiliaryWorkingHours/selectAuxiliaryWorkingHours",//鏌ヨ杈呭姪宸ユ椂
- deleteAuxiliaryWorkingHours:"/auxiliaryWorkingHours/deleteAuxiliaryWorkingHours",//鍒犻櫎杈呭姪宸ユ椂
- upAuxiliaryWorkingHours:"/auxiliaryWorkingHours/upAuxiliaryWorkingHours",//淇敼杈呭姪宸ユ椂
- insertAuxiliaryWorkingHours:"/auxiliaryWorkingHours/insertAuxiliaryWorkingHours",//鏂板杈呭姪宸ユ椂
+ selectAuxiliaryWorkingHours: "/auxiliaryWorkingHours/selectAuxiliaryWorkingHours", //鏌ヨ杈呭姪宸ユ椂
+ deleteAuxiliaryWorkingHours: "/auxiliaryWorkingHours/deleteAuxiliaryWorkingHours", //鍒犻櫎杈呭姪宸ユ椂
+ upAuxiliaryWorkingHours: "/auxiliaryWorkingHours/upAuxiliaryWorkingHours", //淇敼杈呭姪宸ユ椂
+ insertAuxiliaryWorkingHours: "/auxiliaryWorkingHours/insertAuxiliaryWorkingHours", //鏂板杈呭姪宸ユ椂
}
const unPass = {
- pageInsUnPass:"/unPass/pageInsUnPass", // 鏌ヨ涓嶅悎鏍兼牱鍝佹暟鎹�
+ pageInsUnPass: "/unPass/pageInsUnPass", // 鏌ヨ涓嶅悎鏍兼牱鍝佹暟鎹�
}
const companies = {
diff --git a/src/components/view/a6-personnel-detail.vue b/src/components/view/a6-personnel-detail.vue
index 21aeb35..7a6d48a 100644
--- a/src/components/view/a6-personnel-detail.vue
+++ b/src/components/view/a6-personnel-detail.vue
@@ -142,7 +142,7 @@
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="componentData.entity.name"
@keyup.enter.native="refreshTable()" @clear="refreshTable"></el-input>
</div>
- <div class="search_label">
+ <div class="search_label" v-if="upUserDepardLimsIdPower">
<el-button type="primary" size="small" @click="selectUserDia = true">娣诲姞</el-button>
</div>
</div>
@@ -150,7 +150,7 @@
</el-col>
</el-row>
<el-row class="standard_table" v-loading="tableLoad">
- <ValueTable ref="ValueTable" :url="$api.user.selectUserList" :componentData="componentData" />
+ <ValueTable ref="ValueTable" :url="$api.user.selectUserList" :componentData="componentData" :delUrl="$api.user.delUserDepardLimsId"/>
</el-row>
</div>
<el-dialog title="鏋舵瀯鏂板" :visible.sync="addDia" width="400px">
@@ -171,7 +171,7 @@
</el-dialog>
<el-dialog title="閫夋嫨鐢ㄦ埛" :visible.sync="selectUserDia" width="70%">
<div class="body" style="height: 60vh;" v-if="selectUserDia">
- <ValueTable ref="ValueTable2" :url="$api.user.selectUserList" :componentData="componentData2" />
+ <ValueTable ref="ValueTable2" :url="$api.user.selectUserList" :componentData="componentData2"/>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="selectUserDia = false">鍙� 娑�</el-button>
@@ -221,7 +221,12 @@
isIndex: true,
showSelect: false,
select: false,
- do: [],
+ do: [{
+ id: 'delete',
+ font: '鍒犻櫎',
+ type: 'text',
+ method: 'doDiy'
+ }],
tagField: {
state: {
select: [{
@@ -241,7 +246,6 @@
selectUserDia: false,
componentData2: {
entity: {
- isCustom: 0,
orderBy: {
field: 'id',
order: 'asc'
@@ -249,7 +253,7 @@
},
isIndex: true,
showSelect: true,
- select: false,
+ select: true,
do: [],
tagField: {
state: {
@@ -265,6 +269,7 @@
}
},
selectField: {},
+ upUserDepardLimsIdPower: true
}
}
},
@@ -381,6 +386,8 @@
let add = false
let addStandardProduct = false
let delStandardTree = false
+ let upUserDepardLimsId = false
+ let del = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'addDepartmentLims') {
add = true
@@ -391,10 +398,20 @@
if (power[i].menuMethod == 'delDepartmentLims') {
delStandardTree = true
}
+ if (power[i].menuMethod == 'upUserDepardLimsId') {
+ upUserDepardLimsId = true
+ }
+ if(power[i].menuMethod=='delUserDepardLimsId'){
+ del = true
+ }
+ }
+ if(!del){
+ this.componentData.do.splice(0, 1)
}
this.addPower = add
this.addStandardProduct = addStandardProduct
this.delStandardTree = delStandardTree
+ this.upUserDepardLimsIdPower = upUserDepardLimsId
},
selectUser() {
let selects = this.$refs.ValueTable2.multipleSelection
@@ -402,11 +419,21 @@
this.$message.error('鏈�夋嫨鏁版嵁')
return
}
- delete selects['orderBy']
- delete selects['updateUser']
- delete selects['updateTime']
- this.user = selects
+ var ids = []
+ selects.forEach(a=>{
+ ids.push(a.id)
+ })
this.selectUserDia = false
+ this.$axios.post(this.$api.user.upUserDepardLimsId,{
+ ids: JSON.stringify(ids),
+ id: this.componentData.entity.departLimsId
+ }).then(res=>{
+ if (res.code === 201) {
+ return
+ }
+ this.$message.success('娣诲姞鎴愬姛')
+ this.refreshTable()
+ })
}
}
}
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index d40f8cb..7bce4a9 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -398,17 +398,17 @@
</div>
<div style="flex: 1;overflow-y: auto;" v-loading="productTableLoading0">
<el-table :data="productList0" ref="productTable0" style="width: 100%;" height="94%" tooltip-effect="dark"
- stripe :fit="true" border @select-all="handleSelectAll0" @select="handleSelectionChange0" filter-placement="bottom-start"
+ stripe :fit="true" border @select-all="handleSelectAll0" @select="handleSelectionChange0"
header-row-class-name="header-class" :row-key="row=>row.id" @filter-change="filterHandler">
<el-table-column type="selection" width="50">
</el-table-column>
<el-table-column prop="model" label="鍨嬪彿" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip :filters="filters0"
- :filter-multiple="false" column-key="inspectionItem"></el-table-column>
+ :filter-multiple="false" column-key="inspectionItem" filter-placement="bottom-start"></el-table-column>
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140" show-overflow-tooltip
- :filters="filters1" :filter-multiple="false" column-key="inspectionItemSubclass"></el-table-column>
+ :filters="filters1" :filter-multiple="false" column-key="inspectionItemSubclass" filter-placement="bottom-start"></el-table-column>
<el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" width="130" show-overflow-tooltip :filters="filters"
- :filter-multiple="false" column-key="sonLaboratory"></el-table-column>
+ :filter-multiple="false" column-key="sonLaboratory" filter-placement="bottom-start"></el-table-column>
<el-table-column prop="ask" label="瑕佹眰鍊�" min-width="200px"></el-table-column>
<el-table-column prop="tell" label="瑕佹眰鎻忚堪" min-width="220px"></el-table-column>
<el-table-column prop="methodS" label="璇曢獙鏂规硶" width="200"></el-table-column>
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 43f52d3..69e4eaa 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -289,7 +289,8 @@
font: '缂栬緫',
type: 'text',
method: 'doDiy',
- field: ['createUserName', 'updateUserName', 'roleName', '瑙掕壊=roleId', '瀵嗙爜=password']
+ field: ['createUserName', 'updateUserName', 'roleName', '瑙掕壊=roleId', '瀵嗙爜=password',
+ '濮撳悕EN=nameEn','骞撮緞=age','閭=email','鍗曚綅=company','绛惧悕=pictureUrl','鏈汉鐓�=signatureUrl']
}],
tagField: {
state: {
--
Gitblit v1.9.3