From 906c10d1f2b5d87e3e3b60f0f276c025359a8446 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 25 Apr 2024 14:50:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=90=8E=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BAbug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xgf/flow_audit/userInfo.vue | 70 ++++++++++++++++----------- 1 file changed, 41 insertions(+), 29 deletions(-) diff --git a/src/views/xgf/flow_audit/userInfo.vue b/src/views/xgf/flow_audit/userInfo.vue index 4953934..4f00b7b 100644 --- a/src/views/xgf/flow_audit/userInfo.vue +++ b/src/views/xgf/flow_audit/userInfo.vue @@ -19,7 +19,7 @@
- +
@@ -47,13 +47,13 @@
- + :preview-src-list="[config.fileUrl + item.FILEPATH]" + z-index="8000" + style="object-fit: cover; width: 40px; height: 40px"/>
@@ -137,13 +137,13 @@ - + :preview-src-list="[config.fileUrl + item.FILEPATH]" + z-index="8000" + style="object-fit: cover; width: 40px; height: 40px"/> @@ -159,13 +159,13 @@ - + :preview-src-list="[config.fileUrl + item.FILEPATH]" + z-index="8000" + style="object-fit: cover; width: 40px; height: 40px"/> @@ -178,13 +178,13 @@
- + :preview-src-list="[config.fileUrl + item.FILEPATH]" + z-index="8000" + style="object-fit: cover; width: 40px; height: 40px"/>
@@ -258,9 +258,9 @@ - + - + @@ -268,17 +268,16 @@
- - + + :preview-src-list="[config.fileUrl + item.FILEPATH_BACK]" + z-index="8000" + style="object-fit: cover; width: 40px; height: 40px"/>
@@ -413,7 +412,7 @@ - 取 消 + 取 消 @@ -511,6 +510,19 @@ export default { }, download(item) { useDownloadFile(item) + }, + close() { + this.visible = false + this.userDetailForm = {} + this.userCardIDPhotoFile = [] // 身份证照片 + this.trainRecordList = [] + this.photosOfLevel = [] // 三级教育照片 + this.specialUsersList = {} + this.insuranceFileList = [] // 保险文件 + this.contractFileList = [] + this.socialPhotoFile = [] + this.gongshangbaoxianFile = [] + this.applyList = [] } } } From 3fadbc6c6794c6edfbf978345efad1a73f3a364f Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 26 Apr 2024 14:45:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=96=B9=E4=BA=BA=E5=91=98=E6=96=B0=E5=A2=9E=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6-=E4=BC=81=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xgf/allPeopleList/components/list.vue | 27 +++++++++++++++-- src/views/xgf/peopleList/components/list.vue | 29 +++++++++++++++++-- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/views/xgf/allPeopleList/components/list.vue b/src/views/xgf/allPeopleList/components/list.vue index 38d8768..4f4de6e 100644 --- a/src/views/xgf/allPeopleList/components/list.vue +++ b/src/views/xgf/allPeopleList/components/list.vue @@ -31,6 +31,18 @@ + + + + + + + + { this.listLoading = false @@ -270,6 +286,13 @@ export default { }).catch((e) => { this.listLoading = false }) + requestFN( + '/xgf/user/getAllCorpInfo', {} + ).then((data) => { + this.companyList = data.list + }).catch((e) => { + this.loading = false + }) } } } diff --git a/src/views/xgf/peopleList/components/list.vue b/src/views/xgf/peopleList/components/list.vue index 669d7a8..d8a0450 100644 --- a/src/views/xgf/peopleList/components/list.vue +++ b/src/views/xgf/peopleList/components/list.vue @@ -31,6 +31,17 @@ + + + + + + + { this.listLoading = false @@ -269,6 +286,14 @@ export default { }).catch((e) => { this.listLoading = false }) + + requestFN( + '/xgf/user/getAllCorpInfo', {} + ).then((data) => { + this.companyList = data.list + }).catch((e) => { + this.loading = false + }) } } } From ce586aaf31e85befefb10a4b341b7361e31cde72 Mon Sep 17 00:00:00 2001 From: liujun Date: Sun, 28 Apr 2024 14:54:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safetyOperationRegulations/components/list.vue | 3 ++- .../safetyProductionManagementSystem/components/list.vue | 3 ++- .../safetyProductionResponsibilitySystem/components/list.vue | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/threeSystems/safetyOperationRegulations/components/list.vue b/src/views/threeSystems/safetyOperationRegulations/components/list.vue index 599e088..74fba10 100644 --- a/src/views/threeSystems/safetyOperationRegulations/components/list.vue +++ b/src/views/threeSystems/safetyOperationRegulations/components/list.vue @@ -306,7 +306,8 @@ export default { labels: JSON.stringify(this.form.labels), STATUS: this.form.STATUS, ASSOCIATION: '0', - CORPINFO_ID: '0' + CORPINFO_ID: '0', + MIGRATION_FLAG: '1' } ).then((data) => { this.listLoading = false diff --git a/src/views/threeSystems/safetyProductionManagementSystem/components/list.vue b/src/views/threeSystems/safetyProductionManagementSystem/components/list.vue index ea99bd5..573a026 100644 --- a/src/views/threeSystems/safetyProductionManagementSystem/components/list.vue +++ b/src/views/threeSystems/safetyProductionManagementSystem/components/list.vue @@ -242,7 +242,8 @@ export default { labels: JSON.stringify(this.form.labels), STATUS: this.form.STATUS, ASSOCIATION: '1', - CORPINFO_ID: '0' + CORPINFO_ID: '0', + MIGRATION_FLAG: '1' } ).then((data) => { this.listLoading = false diff --git a/src/views/threeSystems/safetyProductionResponsibilitySystem/components/list.vue b/src/views/threeSystems/safetyProductionResponsibilitySystem/components/list.vue index 6e375ec..6c2712d 100644 --- a/src/views/threeSystems/safetyProductionResponsibilitySystem/components/list.vue +++ b/src/views/threeSystems/safetyProductionResponsibilitySystem/components/list.vue @@ -280,7 +280,8 @@ export default { labels: JSON.stringify(this.form.labels), STATUS: this.form.STATUS, ASSOCIATION: '2', - CORPINFO_ID: '0' + CORPINFO_ID: '0', + MIGRATION_FLAG: '1' } ).then((data) => { this.listLoading = false From a3413eb6e5b068547409476c0bce6427d08120ca Mon Sep 17 00:00:00 2001 From: liujun Date: Sun, 28 Apr 2024 16:07:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1=E3=80=81=E7=9B=B8=E5=85=B3=E6=96=B9?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=90=8D=E7=A7=B0=E9=94=99=E8=AF=AF=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=202=E3=80=81=E7=9B=B8=E5=85=B3=E6=96=B9=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=B9=B3=E5=8F=B0=E8=B5=84=E6=BA=90=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{uploadFile => upload-file}/index.vue | 0 src/components/uploadExcel/index.vue | 2 +- src/views/Label/components/editLabel.vue | 2 +- src/views/Label/components/editSonLabel.vue | 2 +- src/views/Label/components/selectLable.vue | 2 +- .../components/editTextLibrary.vue | 2 +- .../components/updateFile.vue | 2 +- .../components/editTextLibrary.vue | 2 +- .../components/updateFile.vue | 2 +- .../components/editTextLibrary.vue | 2 +- .../components/updateFile.vue | 2 +- .../components/editTextLibrary.vue | 2 +- .../components/updateFile.vue | 2 +- .../soLibrary/components/condition.vue | 188 ++++++ .../soLibrary/components/dashboard.vue | 38 ++ .../soLibrary/components/editTextLibrary.vue | 392 ++++++++++++ .../soLibrary/components/list.vue | 561 +++++++++++++++++ .../soLibrary/components/listEm.vue | 504 ++++++++++++++++ .../soLibrary/components/textLibraryInfo.vue | 146 +++++ .../soLibrary/components/updateLog.vue | 55 ++ .../soLibrary/components/updateSpeFile.vue | 77 +++ src/views/threeSystems/soLibrary/index.vue | 19 + .../spmLibrary/components/condition.vue | 188 ++++++ .../spmLibrary/components/dashboard.vue | 38 ++ .../spmLibrary/components/editTextLibrary.vue | 390 ++++++++++++ .../spmLibrary/components/list.vue | 562 ++++++++++++++++++ .../spmLibrary/components/listEm.vue | 503 ++++++++++++++++ .../spmLibrary/components/textLibraryInfo.vue | 146 +++++ .../spmLibrary/components/updateLog.vue | 55 ++ .../spmLibrary/components/updateSpeFile.vue | 77 +++ src/views/threeSystems/spmLibrary/index.vue | 19 + .../sprLibrary/components/condition.vue | 188 ++++++ .../sprLibrary/components/dashboard.vue | 38 ++ .../sprLibrary/components/editTextLibrary.vue | 390 ++++++++++++ .../sprLibrary/components/list.vue | 562 ++++++++++++++++++ .../sprLibrary/components/listEm.vue | 503 ++++++++++++++++ .../sprLibrary/components/textLibraryInfo.vue | 146 +++++ .../sprLibrary/components/updateLog.vue | 55 ++ .../sprLibrary/components/updateSpeFile.vue | 77 +++ src/views/threeSystems/sprLibrary/index.vue | 19 + 40 files changed, 5948 insertions(+), 12 deletions(-) rename src/components/{uploadFile => upload-file}/index.vue (100%) create mode 100644 src/views/threeSystems/soLibrary/components/condition.vue create mode 100644 src/views/threeSystems/soLibrary/components/dashboard.vue create mode 100644 src/views/threeSystems/soLibrary/components/editTextLibrary.vue create mode 100644 src/views/threeSystems/soLibrary/components/list.vue create mode 100644 src/views/threeSystems/soLibrary/components/listEm.vue create mode 100644 src/views/threeSystems/soLibrary/components/textLibraryInfo.vue create mode 100644 src/views/threeSystems/soLibrary/components/updateLog.vue create mode 100644 src/views/threeSystems/soLibrary/components/updateSpeFile.vue create mode 100644 src/views/threeSystems/soLibrary/index.vue create mode 100644 src/views/threeSystems/spmLibrary/components/condition.vue create mode 100644 src/views/threeSystems/spmLibrary/components/dashboard.vue create mode 100644 src/views/threeSystems/spmLibrary/components/editTextLibrary.vue create mode 100644 src/views/threeSystems/spmLibrary/components/list.vue create mode 100644 src/views/threeSystems/spmLibrary/components/listEm.vue create mode 100644 src/views/threeSystems/spmLibrary/components/textLibraryInfo.vue create mode 100644 src/views/threeSystems/spmLibrary/components/updateLog.vue create mode 100644 src/views/threeSystems/spmLibrary/components/updateSpeFile.vue create mode 100644 src/views/threeSystems/spmLibrary/index.vue create mode 100644 src/views/threeSystems/sprLibrary/components/condition.vue create mode 100644 src/views/threeSystems/sprLibrary/components/dashboard.vue create mode 100644 src/views/threeSystems/sprLibrary/components/editTextLibrary.vue create mode 100644 src/views/threeSystems/sprLibrary/components/list.vue create mode 100644 src/views/threeSystems/sprLibrary/components/listEm.vue create mode 100644 src/views/threeSystems/sprLibrary/components/textLibraryInfo.vue create mode 100644 src/views/threeSystems/sprLibrary/components/updateLog.vue create mode 100644 src/views/threeSystems/sprLibrary/components/updateSpeFile.vue create mode 100644 src/views/threeSystems/sprLibrary/index.vue diff --git a/src/components/uploadFile/index.vue b/src/components/upload-file/index.vue similarity index 100% rename from src/components/uploadFile/index.vue rename to src/components/upload-file/index.vue diff --git a/src/components/uploadExcel/index.vue b/src/components/uploadExcel/index.vue index 8c89d69..43b38cf 100644 --- a/src/components/uploadExcel/index.vue +++ b/src/components/uploadExcel/index.vue @@ -17,7 +17,7 @@ + + diff --git a/src/views/threeSystems/soLibrary/components/dashboard.vue b/src/views/threeSystems/soLibrary/components/dashboard.vue new file mode 100644 index 0000000..56486f2 --- /dev/null +++ b/src/views/threeSystems/soLibrary/components/dashboard.vue @@ -0,0 +1,38 @@ + + + diff --git a/src/views/threeSystems/soLibrary/components/editTextLibrary.vue b/src/views/threeSystems/soLibrary/components/editTextLibrary.vue new file mode 100644 index 0000000..6faae97 --- /dev/null +++ b/src/views/threeSystems/soLibrary/components/editTextLibrary.vue @@ -0,0 +1,392 @@ + + diff --git a/src/views/threeSystems/soLibrary/components/list.vue b/src/views/threeSystems/soLibrary/components/list.vue new file mode 100644 index 0000000..bbf4709 --- /dev/null +++ b/src/views/threeSystems/soLibrary/components/list.vue @@ -0,0 +1,561 @@ + + + diff --git a/src/views/threeSystems/soLibrary/components/listEm.vue b/src/views/threeSystems/soLibrary/components/listEm.vue new file mode 100644 index 0000000..2e5a16f --- /dev/null +++ b/src/views/threeSystems/soLibrary/components/listEm.vue @@ -0,0 +1,504 @@ + + + diff --git a/src/views/threeSystems/soLibrary/components/textLibraryInfo.vue b/src/views/threeSystems/soLibrary/components/textLibraryInfo.vue new file mode 100644 index 0000000..b104a8f --- /dev/null +++ b/src/views/threeSystems/soLibrary/components/textLibraryInfo.vue @@ -0,0 +1,146 @@ + + diff --git a/src/views/threeSystems/soLibrary/components/updateLog.vue b/src/views/threeSystems/soLibrary/components/updateLog.vue new file mode 100644 index 0000000..ee30bd2 --- /dev/null +++ b/src/views/threeSystems/soLibrary/components/updateLog.vue @@ -0,0 +1,55 @@ + + diff --git a/src/views/threeSystems/soLibrary/components/updateSpeFile.vue b/src/views/threeSystems/soLibrary/components/updateSpeFile.vue new file mode 100644 index 0000000..63cfb6f --- /dev/null +++ b/src/views/threeSystems/soLibrary/components/updateSpeFile.vue @@ -0,0 +1,77 @@ + + diff --git a/src/views/threeSystems/soLibrary/index.vue b/src/views/threeSystems/soLibrary/index.vue new file mode 100644 index 0000000..8d78561 --- /dev/null +++ b/src/views/threeSystems/soLibrary/index.vue @@ -0,0 +1,19 @@ + + diff --git a/src/views/threeSystems/spmLibrary/components/condition.vue b/src/views/threeSystems/spmLibrary/components/condition.vue new file mode 100644 index 0000000..051c13e --- /dev/null +++ b/src/views/threeSystems/spmLibrary/components/condition.vue @@ -0,0 +1,188 @@ + + + + diff --git a/src/views/threeSystems/spmLibrary/components/dashboard.vue b/src/views/threeSystems/spmLibrary/components/dashboard.vue new file mode 100644 index 0000000..f9b3596 --- /dev/null +++ b/src/views/threeSystems/spmLibrary/components/dashboard.vue @@ -0,0 +1,38 @@ + + + diff --git a/src/views/threeSystems/spmLibrary/components/editTextLibrary.vue b/src/views/threeSystems/spmLibrary/components/editTextLibrary.vue new file mode 100644 index 0000000..590cc93 --- /dev/null +++ b/src/views/threeSystems/spmLibrary/components/editTextLibrary.vue @@ -0,0 +1,390 @@ + + diff --git a/src/views/threeSystems/spmLibrary/components/list.vue b/src/views/threeSystems/spmLibrary/components/list.vue new file mode 100644 index 0000000..a3f8660 --- /dev/null +++ b/src/views/threeSystems/spmLibrary/components/list.vue @@ -0,0 +1,562 @@ + + + diff --git a/src/views/threeSystems/spmLibrary/components/listEm.vue b/src/views/threeSystems/spmLibrary/components/listEm.vue new file mode 100644 index 0000000..f275b9d --- /dev/null +++ b/src/views/threeSystems/spmLibrary/components/listEm.vue @@ -0,0 +1,503 @@ + + + diff --git a/src/views/threeSystems/spmLibrary/components/textLibraryInfo.vue b/src/views/threeSystems/spmLibrary/components/textLibraryInfo.vue new file mode 100644 index 0000000..e9f9aac --- /dev/null +++ b/src/views/threeSystems/spmLibrary/components/textLibraryInfo.vue @@ -0,0 +1,146 @@ + + diff --git a/src/views/threeSystems/spmLibrary/components/updateLog.vue b/src/views/threeSystems/spmLibrary/components/updateLog.vue new file mode 100644 index 0000000..ee30bd2 --- /dev/null +++ b/src/views/threeSystems/spmLibrary/components/updateLog.vue @@ -0,0 +1,55 @@ + + diff --git a/src/views/threeSystems/spmLibrary/components/updateSpeFile.vue b/src/views/threeSystems/spmLibrary/components/updateSpeFile.vue new file mode 100644 index 0000000..63cfb6f --- /dev/null +++ b/src/views/threeSystems/spmLibrary/components/updateSpeFile.vue @@ -0,0 +1,77 @@ + + diff --git a/src/views/threeSystems/spmLibrary/index.vue b/src/views/threeSystems/spmLibrary/index.vue new file mode 100644 index 0000000..8d78561 --- /dev/null +++ b/src/views/threeSystems/spmLibrary/index.vue @@ -0,0 +1,19 @@ + + diff --git a/src/views/threeSystems/sprLibrary/components/condition.vue b/src/views/threeSystems/sprLibrary/components/condition.vue new file mode 100644 index 0000000..fbb3b86 --- /dev/null +++ b/src/views/threeSystems/sprLibrary/components/condition.vue @@ -0,0 +1,188 @@ + + + + diff --git a/src/views/threeSystems/sprLibrary/components/dashboard.vue b/src/views/threeSystems/sprLibrary/components/dashboard.vue new file mode 100644 index 0000000..e7c8301 --- /dev/null +++ b/src/views/threeSystems/sprLibrary/components/dashboard.vue @@ -0,0 +1,38 @@ + + + diff --git a/src/views/threeSystems/sprLibrary/components/editTextLibrary.vue b/src/views/threeSystems/sprLibrary/components/editTextLibrary.vue new file mode 100644 index 0000000..d3b2599 --- /dev/null +++ b/src/views/threeSystems/sprLibrary/components/editTextLibrary.vue @@ -0,0 +1,390 @@ + + diff --git a/src/views/threeSystems/sprLibrary/components/list.vue b/src/views/threeSystems/sprLibrary/components/list.vue new file mode 100644 index 0000000..8829e4d --- /dev/null +++ b/src/views/threeSystems/sprLibrary/components/list.vue @@ -0,0 +1,562 @@ + + + diff --git a/src/views/threeSystems/sprLibrary/components/listEm.vue b/src/views/threeSystems/sprLibrary/components/listEm.vue new file mode 100644 index 0000000..a1c6b1e --- /dev/null +++ b/src/views/threeSystems/sprLibrary/components/listEm.vue @@ -0,0 +1,503 @@ + + + diff --git a/src/views/threeSystems/sprLibrary/components/textLibraryInfo.vue b/src/views/threeSystems/sprLibrary/components/textLibraryInfo.vue new file mode 100644 index 0000000..5ce9a08 --- /dev/null +++ b/src/views/threeSystems/sprLibrary/components/textLibraryInfo.vue @@ -0,0 +1,146 @@ + + diff --git a/src/views/threeSystems/sprLibrary/components/updateLog.vue b/src/views/threeSystems/sprLibrary/components/updateLog.vue new file mode 100644 index 0000000..ee30bd2 --- /dev/null +++ b/src/views/threeSystems/sprLibrary/components/updateLog.vue @@ -0,0 +1,55 @@ + + diff --git a/src/views/threeSystems/sprLibrary/components/updateSpeFile.vue b/src/views/threeSystems/sprLibrary/components/updateSpeFile.vue new file mode 100644 index 0000000..63cfb6f --- /dev/null +++ b/src/views/threeSystems/sprLibrary/components/updateSpeFile.vue @@ -0,0 +1,77 @@ + + diff --git a/src/views/threeSystems/sprLibrary/index.vue b/src/views/threeSystems/sprLibrary/index.vue new file mode 100644 index 0000000..8d78561 --- /dev/null +++ b/src/views/threeSystems/sprLibrary/index.vue @@ -0,0 +1,19 @@ + +
证书名称{{ item.CERTIFICATE }}{{ item.CERTIFICATE }} 作业类别{{ item.SPECIAL_TYPE_NAME }}{{ item.SPECIAL_TYPE_NAME }} 操作项目 {{ item.OPERATION_TYPE_NAME }} 证书照片