From 953edb814893b9340ddab49e310a02bab54ab86c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 14:33:09 +0800
Subject: [PATCH] 人员测试联调
---
src/components/do/a6-personnel-collect/personnel-list.vue | 2
src/components/caorui/Department/components/Plan/UploadExcel.vue | 3
static/js/menu.js | 130 ++++++++++++++++++++++--------------------
src/components/caorui/Department/components/Plan/index.vue | 17 +++--
4 files changed, 81 insertions(+), 71 deletions(-)
diff --git a/src/components/caorui/Department/components/Plan/UploadExcel.vue b/src/components/caorui/Department/components/Plan/UploadExcel.vue
index 99c475f..0cc3f1a 100644
--- a/src/components/caorui/Department/components/Plan/UploadExcel.vue
+++ b/src/components/caorui/Department/components/Plan/UploadExcel.vue
@@ -10,6 +10,7 @@
accept=".xls, .xlsx"
:limit="1"
:auto-upload="true"
+ :show-file-list="false"
>
<el-button size="small" type="primary">瀵煎叆</el-button>
</el-upload>
@@ -55,4 +56,4 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/caorui/Department/components/Plan/index.vue b/src/components/caorui/Department/components/Plan/index.vue
index 560a949..8adc4c3 100644
--- a/src/components/caorui/Department/components/Plan/index.vue
+++ b/src/components/caorui/Department/components/Plan/index.vue
@@ -92,7 +92,7 @@
return {
planId: undefined,
yearForm: {
- organizationPerson: undefined,
+ organizationPerson: undefined,
},
yearTableData: [], // 骞磋〃
yearPage: {
@@ -107,7 +107,7 @@
minWidth: '150px'
}, {
label: '缂栧埗浜�',
- prop: 'organizationPerson',
+ prop: 'organizationPersonName',
minWidth: '100'
}, {
label: '缂栧埗鏃ユ湡',
@@ -117,14 +117,17 @@
label: '鎵瑰噯浜�',
prop: 'approvalName',
minWidth: '100'
- }, {
+ },
+ {
label: '鎵瑰噯鏃ユ湡',
prop: 'approvalDate',
minWidth: '160'
- }, {
- label: '瀹℃牳浜�',
- prop: 'examine'
- }, {
+ },
+ // {
+ // label: '瀹℃牳浜�',
+ // prop: 'examine'
+ // },
+ {
dataType: 'tag',
label: '鎵瑰噯鐘舵��',
prop: 'approvalStatus',
diff --git a/src/components/do/a6-personnel-collect/personnel-list.vue b/src/components/do/a6-personnel-collect/personnel-list.vue
index 57330cf..40ed5ed 100644
--- a/src/components/do/a6-personnel-collect/personnel-list.vue
+++ b/src/components/do/a6-personnel-collect/personnel-list.vue
@@ -243,7 +243,7 @@
})
.then(() => {
this.$axios
- .post(this.$api.user.delUserDepardLimsId + '?id=' + row.id)
+ .post(this.$api.user.delUserDepardLimsId + '?id=' + row.userId)
.then(res => {
if (res.code === 201) {
return;
diff --git a/static/js/menu.js b/static/js/menu.js
index 1ea4b93..be1a405 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -363,13 +363,15 @@
u: "a6-standard-material-requisition",
g: "6.5 璁￠噺婧簮鎬�",
p: ""
- }, {
- v: "杩囨湡鏍囨牱澶勭疆",
- i: "font icon-erjidaohang",
- u: "",
- g: "6.5 璁￠噺婧簮鎬�",
- p: ""
- }, {
+ },
+ // {
+ // v: "杩囨湡鏍囨牱澶勭疆",
+ // i: "font icon-erjidaohang",
+ // u: "",
+ // g: "6.5 璁￠噺婧簮鎬�",
+ // p: ""
+ // },
+ {
v: "鏈嶅姟鍜屼緵搴斿搧閲囪喘",
i: "font icon-erjidaohang",
u: "a6.service-and-supply-purchase",
@@ -395,13 +397,6 @@
// g: "6.4 璁惧",
// p: "selectDeviceParameter"
// },
- {
- v: "鏍囧噯鐗╄川娓呭崟",
- i: "font icon-erjidaohang",
- u: "a6-standard-material-list",
- g: "6.5 璁￠噺婧簮鎬�",
- p: ""
- }
]
},
{
@@ -415,13 +410,15 @@
u: "a7-contract-review",
g: "7.1 瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫",
p: "pageProcessOrder"
- }, {
- v: "鍚堝悓璇勫",
- i: "font icon-erjidaohang",
- u: "a7-contract-review",
- g: "7.1 瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫",
- p: "pageProcessOrder"
- }, {
+ },
+ // {
+ // v: "鍚堝悓璇勫",
+ // i: "font icon-erjidaohang",
+ // u: "a7-contract-review",
+ // g: "7.1 瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫",
+ // p: "pageProcessOrder"
+ // },
+ {
v: "瀹為獙瀹ょ殑妫�娴嬭兘鍔涙。妗�",
i: "font icon-erjidaohang",
u: "a7-standard-method",
@@ -445,13 +442,15 @@
u: "a7-method-verification",
g: "7.2 鏂规硶鐨勯�夋嫨銆侀獙璇佸拰纭",
p: ""
- }, {
- v: "鎶芥牱",
- i: "font icon-erjidaohang",
- u: "",
- g: "7.3 鎶芥牱",
- p: ""
- }, {
+ },
+ // {
+ // v: "鎶芥牱",
+ // i: "font icon-erjidaohang",
+ // u: "",
+ // g: "7.3 鎶芥牱",
+ // p: ""
+ // },
+ {
v: "鏍峰搧鎺ユ敹",
i: "font icon-erjidaohang",
u: "a7-sample-registration",
@@ -463,13 +462,15 @@
u: "a7-sample-disposal",
g: "7.4 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�",
p: "pageProcessTotaldeal"
- }, {
- v: "鎶�鏈褰�",
- i: "font icon-erjidaohang",
- u: "",
- g: "7.5 鎶�鏈褰�",
- p: ""
- }, {
+ },
+ // {
+ // v: "鎶�鏈褰�",
+ // i: "font icon-erjidaohang",
+ // u: "",
+ // g: "7.5 鎶�鏈褰�",
+ // p: ""
+ // },
+ {
v: "娴嬮噺涓嶇‘瀹氬害鐨勮瘎瀹�",
i: "font icon-erjidaohang",
u: "a7-uncertainty-evaluation",
@@ -511,32 +512,35 @@
u: "a7-distribution-of-nonconforming",
g: "7.10 涓嶇鍚堝伐浣�",
p: ""
- }, {
- v: "鏁版嵁鎺у埗鍜屼俊鎭鐞�",
- i: "font icon-erjidaohang",
- u: "",
- g: "7.11 鏁版嵁鎺у埗鍜屼俊鎭鐞�",
- p: ""
- }
+ },
+ // {
+ // v: "鏁版嵁鎺у埗鍜屼俊鎭鐞�",
+ // i: "font icon-erjidaohang",
+ // u: "",
+ // g: "7.11 鏁版嵁鎺у埗鍜屼俊鎭鐞�",
+ // p: ""
+ // }
]
},
{
v: "8 浣撶郴绠＄悊瑕佹眰",
i: "font icon-guanlitixiyaoqiu",
p: "",
- c: [{
- v: "鏂瑰紡",
- i: "font icon-erjidaohang",
- u: "",
- g: "8.1 鏂瑰紡",
- p: ""
- }, {
- v: "绠＄悊浣撶郴鏂囦欢",
- i: "font icon-erjidaohang",
- u: "",
- g: "8.2 绠＄悊浣撶郴鏂囦欢",
- p: ""
- }, {
+ c: [
+ // {
+ // v: "鏂瑰紡",
+ // i: "font icon-erjidaohang",
+ // u: "",
+ // g: "8.1 鏂瑰紡",
+ // p: ""
+ // }, {
+ // v: "绠＄悊浣撶郴鏂囦欢",
+ // i: "font icon-erjidaohang",
+ // u: "",
+ // g: "8.2 绠＄悊浣撶郴鏂囦欢",
+ // p: ""
+ // },
+ {
v: "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�",
i: "font icon-erjidaohang",
u: "a8-file-handling",
@@ -584,13 +588,15 @@
u: "a8-measures_deal_risks_opportunities",
g: "8.5 搴斿椋庨櫓鍜屾満閬囩殑鎺柦",
p: ""
- }, {
- v: "瀹㈡埛鍩烘湰淇℃伅绠＄悊",
- i: "font icon-erjidaohang",
- u: "",
- g: "8.6 鏀硅繘",
- p: ""
- }, {
+ },
+ // {
+ // v: "瀹㈡埛鍩烘湰淇℃伅绠＄悊",
+ // i: "font icon-erjidaohang",
+ // u: "",
+ // g: "8.6 鏀硅繘",
+ // p: ""
+ // },
+ {
v: "瀹㈡埛婊℃剰搴�",
i: "font icon-erjidaohang",
u: "a8-customer-satisfaction",
--
Gitblit v1.9.3