From 43bc101d8c0851ca166c2542fa8c3e837af26af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Mon, 26 Feb 2024 10:53:05 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E5=B0=86=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=E5=92=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E5=BC=B9=E6=A1=86=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E7=82=B9=E5=87=BB=E5=BC=B9=E6=A1=86=E5=A4=96?= =?UTF-8?q?=E4=B8=8D=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/system/companyservice/companyservice_detail/list.vue | 2 +- jianshui-ui/src/views/system/companyservice/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jianshui-ui/src/views/system/companyservice/companyservice_detail/list.vue b/jianshui-ui/src/views/system/companyservice/companyservice_detail/list.vue index fe3e1b3..f10a310 100644 --- a/jianshui-ui/src/views/system/companyservice/companyservice_detail/list.vue +++ b/jianshui-ui/src/views/system/companyservice/companyservice_detail/list.vue @@ -66,7 +66,7 @@ @pagination="getList"/> - + diff --git a/jianshui-ui/src/views/system/companyservice/index.vue b/jianshui-ui/src/views/system/companyservice/index.vue index cdd8fca..4c7a938 100644 --- a/jianshui-ui/src/views/system/companyservice/index.vue +++ b/jianshui-ui/src/views/system/companyservice/index.vue @@ -94,7 +94,7 @@ @pagination="getList"/> - + From 4bbc952f57f77d6ec11e6ae0b23409c4f6ea6dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Mon, 26 Feb 2024 11:17:04 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E7=BC=96=E8=BE=91=E5=92=8C=E6=B7=BB=E5=8A=A0=E6=97=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8E=E7=AB=AF=E6=A0=A1=E9=AA=8C=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E5=90=8D=E7=A7=B0=E5=92=8C=E7=A8=8E=E5=8F=B7=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/CompanyserviceController.java | 14 ++++++++++++++ .../common/core/controller/BaseController.java | 11 +++++++++++ 2 files changed, 25 insertions(+) diff --git a/jianshui-admin/src/main/java/com/jianshui/web/controller/system/CompanyserviceController.java b/jianshui-admin/src/main/java/com/jianshui/web/controller/system/CompanyserviceController.java index 0314c1c..d1639ff 100644 --- a/jianshui-admin/src/main/java/com/jianshui/web/controller/system/CompanyserviceController.java +++ b/jianshui-admin/src/main/java/com/jianshui/web/controller/system/CompanyserviceController.java @@ -4,6 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.jianshui.common.core.domain.entity.Companyservice; +import org.apache.commons.lang3.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -78,6 +79,12 @@ public class CompanyserviceController extends BaseController @PostMapping public AjaxResult add(@RequestBody Companyservice companyservice) { + if (StringUtils.isBlank(companyservice.getSellertax())){ + return toAjax("企业税号不能为空",false); + } + if (StringUtils.isBlank(companyservice.getSellername())){ + return toAjax("企业名称不能为空",false); + } return toAjax(companyserviceService.insertCompanyservice(companyservice)); } @@ -89,6 +96,13 @@ public class CompanyserviceController extends BaseController @PutMapping public AjaxResult edit(@RequestBody Companyservice companyservice) { + if (StringUtils.isBlank(companyservice.getSellertax())){ + return toAjax("企业税号不能为空",false); + } + if (StringUtils.isBlank(companyservice.getSellername())){ + return toAjax("企业名称不能为空",false); + } + return toAjax(companyserviceService.updateCompanyservice(companyservice)); } diff --git a/jianshui-common/src/main/java/com/jianshui/common/core/controller/BaseController.java b/jianshui-common/src/main/java/com/jianshui/common/core/controller/BaseController.java index 11efeef..0a79d81 100644 --- a/jianshui-common/src/main/java/com/jianshui/common/core/controller/BaseController.java +++ b/jianshui-common/src/main/java/com/jianshui/common/core/controller/BaseController.java @@ -143,6 +143,17 @@ public class BaseController return result ? success() : error(); } + /** + * 响应返回结果 + * + * @param msg 返回信息 + * @return 操作结果 + */ + protected AjaxResult toAjax(String msg, boolean result) + { + return result ? AjaxResult.success(msg) : AjaxResult.error(msg); + } + /** * 页面跳转 */ From db8b77856f3efc3f07e60fdd55a73707dddc7d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Mon, 26 Feb 2024 11:23:25 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E5=89=8D=E7=AB=AF=E6=B7=BB=E5=8A=A0=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=A8=8E=E5=8F=B7=E5=92=8C=E5=90=8D=E7=A7=B0=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jianshui-ui/src/views/system/companyservice/index.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jianshui-ui/src/views/system/companyservice/index.vue b/jianshui-ui/src/views/system/companyservice/index.vue index 4c7a938..6d6b87f 100644 --- a/jianshui-ui/src/views/system/companyservice/index.vue +++ b/jianshui-ui/src/views/system/companyservice/index.vue @@ -203,7 +203,14 @@ export default { // 表单参数 form: {}, // 表单校验 - rules: {} + rules: { + sellertax: [ + { required: true, message: "属性不能为空", trigger: "blur" } + ], + sellername: [ + { required: true, message: "值不能为空", trigger: "blur" } + ] + } }; }, created() { From 5d610e2ba0012f0f7e2e2d94ce1941241368b213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Mon, 26 Feb 2024 14:22:53 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=89=A9=E5=B1=95=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/companyservice/companyservice_prop/list.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jianshui-ui/src/views/system/companyservice/companyservice_prop/list.vue b/jianshui-ui/src/views/system/companyservice/companyservice_prop/list.vue index aaa4c01..d7a07df 100644 --- a/jianshui-ui/src/views/system/companyservice/companyservice_prop/list.vue +++ b/jianshui-ui/src/views/system/companyservice/companyservice_prop/list.vue @@ -157,6 +157,8 @@ export default { title: '', // 是否显示弹出层 open: false, + //修改标识 + updateFlag: false, // 查询参数 queryParams: { pageNum: 1, @@ -230,6 +232,7 @@ export default { handleAdd() { this.reset() this.open = true + this.updateFlag = false this.title = '添加企业扩展属性，包括大象key等' }, /** 修改按钮操作 */ @@ -237,6 +240,7 @@ export default { this.reset() this.form = row this.open = true + this.updateFlag = true this.title = '修改企业扩展属性，包括大象key等' // const companyid = row.companyid // const key = row.key @@ -251,7 +255,7 @@ export default { this.$refs['form'].validate(valid => { this.form.companyid = this.companyId if (valid) { - if (this.form.key != null) { + if (this.updateFlag) { updateProp(this.form).then(response => { this.$modal.msgSuccess('修改成功') this.open = false From fddc96a92edfa4f35007b1cfbc03b8f4799f5400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Mon, 26 Feb 2024 14:56:10 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E6=89=A9=E5=B1=95=E5=B1=9E=E6=80=A7=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=B6=E8=AE=BE=E7=BD=AE=E4=B8=BA=E4=B8=8D=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/companyservice/companyservice_prop/list.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jianshui-ui/src/views/system/companyservice/companyservice_prop/list.vue b/jianshui-ui/src/views/system/companyservice/companyservice_prop/list.vue index d7a07df..03e0eb4 100644 --- a/jianshui-ui/src/views/system/companyservice/companyservice_prop/list.vue +++ b/jianshui-ui/src/views/system/companyservice/companyservice_prop/list.vue @@ -112,7 +112,7 @@ - + @@ -159,6 +159,8 @@ export default { open: false, //修改标识 updateFlag: false, + //修改时只读 + readOnly : false, // 查询参数 queryParams: { pageNum: 1, @@ -200,6 +202,7 @@ export default { cancel() { this.open = false this.reset() + this.readOnly = false }, // 表单重置 reset() { @@ -234,6 +237,7 @@ export default { this.open = true this.updateFlag = false this.title = '添加企业扩展属性，包括大象key等' + this.readOnly = false }, /** 修改按钮操作 */ handleUpdate(row) { @@ -241,6 +245,7 @@ export default { this.form = row this.open = true this.updateFlag = true + this.readOnly = true this.title = '修改企业扩展属性，包括大象key等' // const companyid = row.companyid // const key = row.key From 0dfac261da59061332617cb7278b9230bee0abdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Mon, 26 Feb 2024 15:19:04 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E4=BC=81=E4=B8=9AID=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/system/ServiceManageMapper.xml | 1 + jianshui-ui/src/views/system/manageservices/index.vue | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/jianshui-system/src/main/resources/mapper/system/ServiceManageMapper.xml b/jianshui-system/src/main/resources/mapper/system/ServiceManageMapper.xml index a4c7171..fec1cb6 100644 --- a/jianshui-system/src/main/resources/mapper/system/ServiceManageMapper.xml +++ b/jianshui-system/src/main/resources/mapper/system/ServiceManageMapper.xml @@ -42,6 +42,7 @@