From a270b5fce09021dd8d3a321cde768d87365f780c Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 25 Nov 2024 11:42:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E6=96=B0=E5=A2=9E=E4=BC=81=E4=B8=9A=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=81=E8=B4=A7=E4=B8=BB=E3=80=81=E9=A9=BB=E6=B8=AF=E5=8D=95?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/components/corpInfoList.vue | 520 ++++++++++++++++++ src/views/relevantunits/base/index.vue | 24 + .../cargo_owner/components/corpInfoList.vue | 519 +++++++++++++++++ src/views/relevantunits/cargo_owner/index.vue | 24 + .../insert/components/corpInfoAdd.vue | 12 +- .../insert/components/corpInfoEdit.vue | 12 +- 6 files changed, 1108 insertions(+), 3 deletions(-) create mode 100644 src/views/relevantunits/base/components/corpInfoList.vue create mode 100644 src/views/relevantunits/base/index.vue create mode 100644 src/views/relevantunits/cargo_owner/components/corpInfoList.vue create mode 100644 src/views/relevantunits/cargo_owner/index.vue diff --git a/src/views/relevantunits/base/components/corpInfoList.vue b/src/views/relevantunits/base/components/corpInfoList.vue new file mode 100644 index 0000000..a417039 --- /dev/null +++ b/src/views/relevantunits/base/components/corpInfoList.vue @@ -0,0 +1,520 @@ + + + diff --git a/src/views/relevantunits/base/index.vue b/src/views/relevantunits/base/index.vue new file mode 100644 index 0000000..eb2249a --- /dev/null +++ b/src/views/relevantunits/base/index.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/relevantunits/cargo_owner/components/corpInfoList.vue b/src/views/relevantunits/cargo_owner/components/corpInfoList.vue new file mode 100644 index 0000000..dc837bb --- /dev/null +++ b/src/views/relevantunits/cargo_owner/components/corpInfoList.vue @@ -0,0 +1,519 @@ + + + diff --git a/src/views/relevantunits/cargo_owner/index.vue b/src/views/relevantunits/cargo_owner/index.vue new file mode 100644 index 0000000..eb2249a --- /dev/null +++ b/src/views/relevantunits/cargo_owner/index.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/relevantunits/insert/components/corpInfoAdd.vue b/src/views/relevantunits/insert/components/corpInfoAdd.vue index af2e497..a05b3c7 100644 --- a/src/views/relevantunits/insert/components/corpInfoAdd.vue +++ b/src/views/relevantunits/insert/components/corpInfoAdd.vue @@ -80,6 +80,15 @@ + + + + + + + 注意:若相关方企业类型为驻港、货主时,该企业的所有信息将不会被统计在相关方统计中,仅在对应的统计功能中展示 + + @@ -354,7 +363,8 @@ export default { CITY: '', COUNTY: '', VILLAGE: '', - INDUSTRYALL: '' + INDUSTRYALL: '', + TYPE: '' }, hylxList: [], // 国民经济行业分类 (GB-T4754-2017) dialogImageUrl: '', // 上传图片预览 diff --git a/src/views/relevantunits/insert/components/corpInfoEdit.vue b/src/views/relevantunits/insert/components/corpInfoEdit.vue index 99514ec..7a5a61a 100644 --- a/src/views/relevantunits/insert/components/corpInfoEdit.vue +++ b/src/views/relevantunits/insert/components/corpInfoEdit.vue @@ -83,6 +83,14 @@ + + + + + + + + @@ -232,7 +240,6 @@ export default { { RELEVANT_UNIT_NAME: value, CORPINFO_ID: this.$parent.CORPINFO_ID - } ).then((data) => { if (data.pd) { @@ -370,7 +377,8 @@ export default { CITY: '', COUNTY: '', VILLAGE: '', - INDUSTRYALL: '' + INDUSTRYALL: '', + TYPE: '' }, hylxList: [], // 国民经济行业分类 (GB-T4754-2017) dialogImageUrl: '', // 上传图片预览 From 481f12510427958e1c89f53599376be486406490 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 26 Nov 2024 15:29:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A9=BB=E6=B8=AF=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E3=80=81=E8=B4=A7=E4=B8=BB=E5=8D=95=E4=BD=8D=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/relevantunits/audit/components/list.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/relevantunits/audit/components/list.vue b/src/views/relevantunits/audit/components/list.vue index 4f29611..a733db9 100644 --- a/src/views/relevantunits/audit/components/list.vue +++ b/src/views/relevantunits/audit/components/list.vue @@ -357,7 +357,8 @@ export default { EMPLOYMENT_FORM: this.searchForm.EMPLOYMENT_FORM, SELECT_FORM: this.searchForm.SELECT_FORM, MAIN_DEP: JSON.parse(sessionStorage.getItem('user')).DEPARTMENT_ID, - CORP_TYPE: this.searchForm.CORP_TYPE + CORP_TYPE: this.searchForm.CORP_TYPE, + canApprove: '1' } ).then((data) => { this.listLoading = false