From 377b3968da25cb307b04ad05916805a6ef325dab Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 30 Jul 2024 13:41:51 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/client/customermanagement.js | 8 +- yxt-as-ui/src/router/index.js | 6 + .../customermanagement/customermanagement.vue | 134 +++++++++++++++++- .../customermanagement/relation/person.vue | 113 +++++++++++++++ .../customermanagement/relation/vehicle.vue | 5 +- .../relation/vehicleAdd.vue | 11 +- 6 files changed, 267 insertions(+), 10 deletions(-) create mode 100644 yxt-as-ui/src/views/client/customermanagement/relation/person.vue diff --git a/yxt-as-ui/src/api/client/customermanagement.js b/yxt-as-ui/src/api/client/customermanagement.js index bccfdfcfb1..5991669c97 100644 --- a/yxt-as-ui/src/api/client/customermanagement.js +++ b/yxt-as-ui/src/api/client/customermanagement.js @@ -44,7 +44,7 @@ export default { // 定点企业禁用 disableState: function(data) { return request({ - url: '/crm/v1/crmcustomerorg/disableState', + url: '/crm/v1/crmcustomertemp/disableState', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } @@ -53,7 +53,7 @@ export default { // 定点企业启用 enable: function(data) { return request({ - url: '/crm/v1/crmcustomerorg/enable', + url: '/crm/v1/crmcustomertemp/enable', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } @@ -103,7 +103,7 @@ export default { // 对接人列表 personList: function(params) { return request({ - url: '/as/v1/ascustomerperson/personList', + url: '/crm/v1/crmmaintenanceenterpriseperson/personList', method: 'get', params: params }) @@ -111,7 +111,7 @@ export default { // 删除对接人信息 delPersonBySids: function(data) { return request({ - url: '/as/v1/ascustomerperson/delBySids', + url: '/crm/v1/crmmaintenanceenterpriseperson/delBySids', method: 'DELETE', data: data, headers: { 'Content-Type': 'application/json' } diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js index 0492665998..de51a10848 100644 --- a/yxt-as-ui/src/router/index.js +++ b/yxt-as-ui/src/router/index.js @@ -431,6 +431,12 @@ export const constantRoutes = [{ name: 'CustomerManagement', meta: { title: '客户管理', noCache: true } }, + { + path: '/filing/maintenanceEnterprise', + component: () => import('@/views/client/filing/maintenanceEnterprise.vue'), + name: 'MaintenanceEnterprise', + meta: { title: '定点企业备案', noCache: true } + }, { path: '/customerunit/customerunit', component: () => import('@/views/client/customerunit/customerunit.vue'), diff --git a/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue b/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue index 0b6b4d2748..9b2b421bd0 100644 --- a/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue +++ b/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue @@ -58,6 +58,18 @@ + + + + + + + + @@ -93,13 +95,15 @@ import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' import req from '@/api/basicinformation/technicalTitle' import { typeValues } from '@/api/Common/dictcommons' +import technicalTitleFilingAdd from '../technicalTitleFiling/technicalTitleFilingAdd' export default { name: 'TechnicalTitle', components: { Pagination, pageye, - ButtonBar + ButtonBar, + technicalTitleFilingAdd }, data() { return { @@ -138,6 +142,13 @@ export default { btnKey: 'toEdit', btnLabel: '编辑' }, + { + type: 'primary', + size: 'small', + icon: '', + btnKey: 'toFiling', + btnLabel: '备案' + }, { type: 'danger', size: 'small', @@ -208,6 +219,9 @@ export default { case 'toEdit': this.toEdit() break + case 'toFiling': + this.toFiling() + break case 'doDel': this.doDel() break @@ -343,6 +357,15 @@ export default { createOrgName: '' } }, + toFiling() { + if (this.sids.length > 0) { + this.viewState = 2 + this.$refs['divAdd'].showAdd(this.sids) + } else { + this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' }) + return + } + }, // 删除 doDel() { if (this.sids.length === 0) { diff --git a/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFiling.vue b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFiling.vue new file mode 100644 index 0000000000..83334b8849 --- /dev/null +++ b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFiling.vue @@ -0,0 +1,326 @@ + + + + diff --git a/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingAdd.vue b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingAdd.vue new file mode 100644 index 0000000000..1b8459cab8 --- /dev/null +++ b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingAdd.vue @@ -0,0 +1,261 @@ + + + + + diff --git a/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingInfo.vue b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingInfo.vue new file mode 100644 index 0000000000..a36b7a3279 --- /dev/null +++ b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingInfo.vue @@ -0,0 +1,143 @@ + + + + + diff --git a/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingDaiBan.vue b/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingDaiBan.vue new file mode 100644 index 0000000000..85e8f07722 --- /dev/null +++ b/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingDaiBan.vue @@ -0,0 +1,374 @@ + + + + + diff --git a/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingEdit.vue b/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingEdit.vue new file mode 100644 index 0000000000..14664c287c --- /dev/null +++ b/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingEdit.vue @@ -0,0 +1,227 @@ + + + + + diff --git a/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingYiBan.vue b/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingYiBan.vue new file mode 100644 index 0000000000..22c026f450 --- /dev/null +++ b/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingYiBan.vue @@ -0,0 +1,192 @@ + + + + + From 5bbe44ca241df77c03ac8c38db339816f999e358 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 31 Jul 2024 10:43:57 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86--=E6=8B=BC=E9=9F=B3?= =?UTF-8?q?=E7=BC=A9=E5=86=99=E6=94=B9=E4=B8=BA=E9=A1=B9=E7=9B=AE=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E3=80=81=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-riskcenter-ui/.env.development | 2 +- .../basicinformation/maintenanceitem/maintenanceitem.vue | 2 +- .../maintenanceitem/maintenanceitemAdd.vue | 7 ++++++- .../maintenanceitem/maintenanceitemInfo.vue | 7 ++++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/anrui-riskcenter-ui/.env.development b/anrui-riskcenter-ui/.env.development index 284a65afb4..cbbbedcf2b 100644 --- a/anrui-riskcenter-ui/.env.development +++ b/anrui-riskcenter-ui/.env.development @@ -6,5 +6,5 @@ VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 ##VUE_APP_URL = "http://26077a35f5.wicp.vip" -VUE_APP_URL = "http://anrui.yyundong.com" +VUE_APP_URL = "http://120.46.172.184:8111" diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue index 5fbab88084..244bcf809d 100644 --- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue +++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue @@ -61,7 +61,7 @@ {{ scope.row.isEnable == '0' ? '禁用' : scope.row.isEnable == '1' ? '启用' : '' }} - + diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue index 01b7fe942b..62590d8ddf 100644 --- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue +++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue @@ -16,7 +16,7 @@ -
拼音缩写
+
项目编码
{{ formobj.sitemCode }}
@@ -111,6 +111,11 @@ + + + 注:维修项目涉及的价格填写时均应为不含税价格。 + + diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue index 466366049a..5b78611fd6 100644 --- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue +++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue @@ -15,7 +15,7 @@ {{ formobj.sitemName }} -
拼音缩写
+
项目编码
{{ formobj.sitemCode }}
@@ -79,6 +79,11 @@ {{ formobj.sortNo }} + + + 注:维修项目涉及的价格填写时均应为不含税价格。 + + From e4a42a953a7b8e70d46a1c092bbf975546c81fcd Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 31 Jul 2024 10:50:15 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/basicinformation/maintenanceitem/maintenanceitem.vue | 3 +-- .../basicinformation/maintenanceitem/maintenanceitemAdd.vue | 2 +- .../basicinformation/maintenanceitem/maintenanceitemInfo.vue | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue index 244bcf809d..2870b8d280 100644 --- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue +++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue @@ -61,9 +61,8 @@ {{ scope.row.isEnable == '0' ? '禁用' : scope.row.isEnable == '1' ? '启用' : '' }}
- - + diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue index 62590d8ddf..f72ca4f618 100644 --- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue +++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue @@ -113,7 +113,7 @@ - 注:维修项目涉及的价格填写时均应为不含税价格。 + 注:维修项目涉及的价格填写时均应为不含税价格。 diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue index 5b78611fd6..a8d3906690 100644 --- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue +++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue @@ -81,7 +81,7 @@ - 注:维修项目涉及的价格填写时均应为不含税价格。 + 注:维修项目涉及的价格填写时均应为不含税价格。 From eb68b5fd5e74f1c39fde297db22824e507f7549f Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 31 Jul 2024 11:07:39 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=8F=AD=E7=BB=84?= =?UTF-8?q?=E7=AE=A1=E7=90=86--=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=88=97=E5=90=8D?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/views/basicinformation/team/team.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yxt-as-ui/src/views/basicinformation/team/team.vue b/yxt-as-ui/src/views/basicinformation/team/team.vue index cf691f6668..437645d381 100644 --- a/yxt-as-ui/src/views/basicinformation/team/team.vue +++ b/yxt-as-ui/src/views/basicinformation/team/team.vue @@ -30,9 +30,9 @@ - - + + From 440e9d8152fe2d283ac6ade656419233a9ceefa0 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 31 Jul 2024 11:09:18 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=B4=A2=E8=B5=94?= =?UTF-8?q?=E5=8E=82=E5=AE=B6=E7=AE=A1=E7=90=86--=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=EF=BC=8C=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E5=88=97=E5=90=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../claimantManufacturer/claimantManufacturer.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yxt-as-ui/src/views/basicinformation/claimantManufacturer/claimantManufacturer.vue b/yxt-as-ui/src/views/basicinformation/claimantManufacturer/claimantManufacturer.vue index 8268b177e6..b67b520382 100644 --- a/yxt-as-ui/src/views/basicinformation/claimantManufacturer/claimantManufacturer.vue +++ b/yxt-as-ui/src/views/basicinformation/claimantManufacturer/claimantManufacturer.vue @@ -31,9 +31,9 @@ - + - + From 3700c3bea3c8622d88d2e3a20b05b53568fc9df6 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 31 Jul 2024 11:11:58 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=99=84=E5=8A=A0?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86--=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8B=BC=E9=9F=B3=E7=BC=A9=E5=86=99=E4=B8=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BC=96=E7=A0=81=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../additionitem/additionitem.vue | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue b/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue index 362e3410d6..eaba1bfecc 100644 --- a/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue +++ b/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue @@ -35,7 +35,7 @@ - + @@ -59,7 +59,7 @@ -
拼音缩写
+
项目编码
{{ formobj.aitemCode }}
@@ -83,6 +83,11 @@ + + + 注:附加项目销售价填写时应为不含税价格。 + +