From b604aa9785570b35a815f4438839134720a3740a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=80=9D=E6=BA=90?= Date: Mon, 6 Jun 2022 14:54:04 +0800 Subject: [PATCH 01/59] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fee/project/components/projectForm.vue | 65 ++++++++++++++----- vue_ui/src/views/fee/project/index.vue | 23 +++++-- 2 files changed, 67 insertions(+), 21 deletions(-) diff --git a/vue_ui/src/views/fee/project/components/projectForm.vue b/vue_ui/src/views/fee/project/components/projectForm.vue index 1f14c4cc..27578dde 100644 --- a/vue_ui/src/views/fee/project/components/projectForm.vue +++ b/vue_ui/src/views/fee/project/components/projectForm.vue @@ -48,7 +48,7 @@ export default { codemsg: { type: Object, default: () => {} - } + }, }, data() { return { @@ -56,6 +56,7 @@ export default { updateApi: "/purchase/ms/feeProject", formData:{ id: this.init.id, + currentId:null, parentId: this.init.parentId ? this.init.parentId : this.parentId, projectCode:'', status:this.init.status ? this.init.status : 1 @@ -79,6 +80,7 @@ export default { type: "text", name: "projectCode", label: "费用项目代码", + disabledOn:'disabled', rule: [ { required: true, @@ -181,10 +183,12 @@ export default { }, { type: "select", - name: "status", + name: "isEnable", label: "状态", disabledOn:'disabled', dictCode: "isEnable", + // labelField: "isEnable", + // url:'/purchase/ms/feeProject/findList?level=1', isValueNum: true, }, { @@ -198,7 +202,7 @@ export default { label: "结案数据来源", placeholder: "请选择", dictCode: "settlementSource", - isValueNum: true, + // isValueNum: true, rule: [ { required: true, message: "结案数据来源不能为空", trigger: "change" }, ], @@ -213,12 +217,24 @@ export default { size: "mini", ifFun:(_model)=>{ console.log(_model.id); - return _model.id && _model.status == 0; + return _model.id && _model.isEnable == 0; }, click: (_row) => { this.title = "启用"; - this.isEdit = false; - this.open = false; + this.currentId = _row.id; + // console.log(this.currentId) + this.$pagexRequest({ + url:`purchase/ms/feeProject/updateField` , + method: "PUT", + data:{ + id:_row.id, + isEnable: 1 + } + }).then(res=>{ + console.log(res) + this.msgSuccess('启用成功') + this.$emit("enableFn") + }) }, }, { @@ -226,14 +242,24 @@ export default { type: "", size: "mini", ifFun:(_model)=>{ - return _model.id && _model.status == 1; + return _model.id && _model.isEnable == 1; }, click: (_row) => { this.title = "禁用"; - this.$set(this, "init", { organizationId: this.org.id }); - // api: - this.isEdit = false; - this.open = false; + this.currentId = _row.id; + this.$pagexRequest({ + url:`purchase/ms/feeProject/updateField` , + method: "PUT", + data:{ + id:_row.id, + isEnable: 0 + } + }).then(res=>{ + console.log(res) + this.msgSuccess('禁用成功') + this.$emit("enableFn") + }) + }, }, { @@ -244,7 +270,16 @@ export default { click: (_row) => { this.title = "删除"; this.isEdit = false; - // url:'/ms/feeProject/?id= + parentId' + console.log(_row) + this.$pagexRequest({ + url:`purchase/ms/feeProject/${_row.id}` , + method: "DELETE", + }).then(res=>{ + console.log(res) + this.msgSuccess('删除成功') + this.isFormShow = false + this.$emit("enableFn") + }) }, }, ], @@ -252,8 +287,8 @@ export default { }, created() { - console.log(this.parentId); - console.log(this.isEdit); + // console.log(this.parentId); + // console.log(this.isEdit); }, mounted(){ if(!this.isEdit){ @@ -268,7 +303,7 @@ export default { }).then(res=>{ this.$refs.form.setModelProp('projectCode',res.data); }) - } + }, }, }; diff --git a/vue_ui/src/views/fee/project/index.vue b/vue_ui/src/views/fee/project/index.vue index 7aee7217..d738e32e 100644 --- a/vue_ui/src/views/fee/project/index.vue +++ b/vue_ui/src/views/fee/project/index.vue @@ -9,13 +9,16 @@ :props="defaultProps" ref="tree" node-key = "id" + :default-expanded-keys="idArr" + :default-checked-keys="[currentId]" @node-click="nodeClick" + @check-change="handleCheckChange" > -
- -
+
+ +
暂无数据
@@ -36,6 +39,7 @@ export default { isFormShow: false, addIsShow: false, parentId: null, + idArr:[], isEdit: false, defaultProps:{ label:'name', @@ -61,7 +65,6 @@ export default { }, mounted() { this.getTree() - }, methods: { @@ -78,12 +81,17 @@ export default { this.treeData = res }) }, + handleCheckChange(data, checked, indeterminate) { + console.log(data, checked, indeterminate, 111111); + }, nodeClick(node){ - if(node.children.length === 0) { + if(node.data.level != 1) { this.isEdit = true; this.parentId = null; this.init = node.data; + this.idArr.push(node.id) + console.log(this.idArr) this.isFormShow = false this.$nextTick(() => { this.isFormShow = true @@ -106,8 +114,11 @@ export default { this.isFormShow = true }) }, + - + enableFn(){ + this.reload() + } }, }; -- Gitee From 5a35d82ef8429ea0d84f1f80a12101c4f6195b27 Mon Sep 17 00:00:00 2001 From: yutao <826775476@qq.com> Date: Mon, 6 Jun 2022 15:02:34 +0800 Subject: [PATCH 02/59] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AgreementAgreementServiceImpl.java | 6 ++++++ .../fhs/agreement/vo/AgreementGoodsSettVO.java | 15 ++++++++++----- .../com/fhs/agreement/vo/AgreementSelectData.java | 4 +++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/service/impl/AgreementAgreementServiceImpl.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/service/impl/AgreementAgreementServiceImpl.java index 19baa200..be97382d 100644 --- a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/service/impl/AgreementAgreementServiceImpl.java +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/service/impl/AgreementAgreementServiceImpl.java @@ -12,6 +12,7 @@ import com.fhs.basics.context.UserContext; import com.fhs.common.utils.StringUtils; import com.fhs.core.base.service.impl.BaseServiceImpl; import com.fhs.core.cache.annotation.Namespace; +import com.fhs.core.valid.checker.ParamChecker; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -102,6 +103,7 @@ public class AgreementAgreementServiceImpl extends BaseServiceImpl goodsList = agreementGoodsSettService.goosByaAreementId(id); for (AgreementGoodsSettVO sett: goodsList) { AgreementSelectData selectData = new AgreementSelectData(); @@ -116,6 +118,10 @@ public class AgreementAgreementServiceImpl extends BaseServiceImpl specificationId; + private List specificationId = new ArrayList<>(); @Data public static class Goodspecification{ -- Gitee From 97c245c93a1f6804b2e23dde36d52ff05ec4ab7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E5=86=9B=E4=BC=9F?= <476810650@qq.com> Date: Mon, 6 Jun 2022 15:33:39 +0800 Subject: [PATCH 03/59] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=BD=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue_ui/src/router/index.js | 2 +- .../views/agreement/agreementInput/index.vue | 28 +++------- .../agreement/components/agreementForm.vue | 56 +++++++++++-------- 3 files changed, 41 insertions(+), 45 deletions(-) diff --git a/vue_ui/src/router/index.js b/vue_ui/src/router/index.js index dd39109a..06cb78c1 100644 --- a/vue_ui/src/router/index.js +++ b/vue_ui/src/router/index.js @@ -102,7 +102,7 @@ export const constantRoutes = [ { path: 'agreementDetail', component: () => import('@/views/agreement/components/agreementForm.vue'), - name: 'Data', + name: 'agreementForm', meta: { title: '协议录入-详情', icon: '' } } ] diff --git a/vue_ui/src/views/agreement/agreementInput/index.vue b/vue_ui/src/views/agreement/agreementInput/index.vue index 757b800d..b0f05bef 100644 --- a/vue_ui/src/views/agreement/agreementInput/index.vue +++ b/vue_ui/src/views/agreement/agreementInput/index.vue @@ -1,6 +1,6 @@