diff --git a/src/components/customerOrg/ContactPersonEdit.vue b/src/components/customerOrg/ContactPersonEdit.vue index bb60c1b..128a3cb 100644 --- a/src/components/customerOrg/ContactPersonEdit.vue +++ b/src/components/customerOrg/ContactPersonEdit.vue @@ -66,7 +66,7 @@
- 取 消 + 取 消 新增联系方式 确 定
diff --git a/src/components/customerOrg/customerOrgEdit.vue b/src/components/customerOrg/customerOrgEdit.vue index 40fe525..2365539 100644 --- a/src/components/customerOrg/customerOrgEdit.vue +++ b/src/components/customerOrg/customerOrgEdit.vue @@ -162,7 +162,7 @@ class="el-icon-check">保存
- + 删除
@@ -220,7 +220,7 @@ export default { rules: { displayName: [{ required: true, message: "请输入单位名称", trigger: "blur" }], shortName: [{ required: true, message: "请输入单位简写", trigger: "blur" }], - orgTypeId: [{ required: true, message: "请输入单位性质", trigger: "blur" }], + orgTypeId: [{ required: true, message: "请输入单位性质", trigger: "blur" }], organizationUnitId: [ { required: true, message: "请输入体检中心", trigger: "blur" }, ], @@ -269,7 +269,7 @@ export default { //获取单位信息 getCustomerOrgRd(id) { - if (!id){ + if (!id) { this.form = deepCopy(this.formInit) return; } @@ -293,14 +293,14 @@ export default { }, // 初始化 字典数据 - dictInit() { + dictInit() { //获取组织体检中心数据 getapi("/api/app/organization-units/organization-unit-by-is-peis").then((res) => { this.data.organizationdata = res.data; }); //获取单位类别列表 - getapi("/api/app/customer-org-type/in-filter").then((res) => { + getapi("/api/app/customer-org-type/get-all").then((res) => { this.data.customerOrgType = res.data.items; }); }, @@ -421,14 +421,16 @@ export default { } console.log("body", body, "this.form", this.form); - + if (!this.form.id) { //id为空则新增 postapi(`/api/app/customerorg/create`, body).then((res) => { if (res.code == 1) { console.log("创健 操作成功"); //this.setData({ key: "customerOrg.customerOrgRd", value: res }); - this.customerOrg.customerOrgId = res.data.id; + this.form = res.data + this.dataTransOpts.tableS.customer_org.id = res.data.id + // this.customerOrg.customerOrgId = res.data.id; this.customerOrg.customerOrgRd = res.data; this.getCustomerOrgTree("insert", res.data); this.customerOrg.oprStatus = 'edit' @@ -466,25 +468,25 @@ export default { this.customerOrg.oprStatus = '' return; } - this.form.parentId = this.dataTransOpts.tableS.customer_org.id - } else { + this.form.parentId = this.dataTransOpts.tableS.customer_org.id + } else { // 新增一级单位时，清除 vuex 一级单位ID - this.dataTransOpts.tableS.customer_org.parent_id = '' + this.dataTransOpts.tableS.customer_org.parent_id = '' } this.customerOrg.oprStatus = 'add' // this.customerOrg.customerOrgId = ""; this.dataTransOpts.tableS.customer_org.id = '' setTimeout(() => { - this.dataTransOpts.refresh.customer_org_register.M++ - this.dataTransOpts.refresh.contact_person.M++ - }, 20); - + this.dataTransOpts.refresh.customer_org_register.M++ + this.dataTransOpts.refresh.contact_person.M++ + }, 20); + }, //删除 - del(formName) { - if (!this.customerOrg.customerOrgRd.id) { + btnDel(formName) { + if (!this.dataTransOpts.tableS.customer_org.id) { this.$message.warning("请先选中要删除的节点") return } @@ -508,7 +510,8 @@ export default { this.setData({ key: "customerOrg.customerOrgRd", value: { id: "" } }); this.$refs[formName].resetFields(); this.customerOrg.oprStatus = '' - this.customerOrg.customerOrgId = '' + // this.customerOrg.customerOrgId = '' + this.dataTransOpts.tableS.customer_org.id = '' } }).catch((err) => { if (err == "cancel") { diff --git a/src/components/customerOrg/customerOrgGroupAsbitem.vue b/src/components/customerOrg/customerOrgGroupAsbitem.vue index 85c2178..7013bef 100644 --- a/src/components/customerOrg/customerOrgGroupAsbitem.vue +++ b/src/components/customerOrg/customerOrgGroupAsbitem.vue @@ -174,8 +174,8 @@ - 取消 - 确定 + 取消 + 确定 @@ -260,8 +260,8 @@ - 取消 - 确定 + 取消 + 确定 diff --git a/src/components/patientRegisterSign/customerOrgEdit.vue b/src/components/patientRegisterSign/customerOrgEdit.vue index 08883b4..2900b55 100644 --- a/src/components/patientRegisterSign/customerOrgEdit.vue +++ b/src/components/patientRegisterSign/customerOrgEdit.vue @@ -293,7 +293,7 @@ export default { //获取单位类别列表 getOrgType() { - getapi("/api/app/customer-org-type/in-filter").then((res) => { + getapi("/api/app/customer-org-type/get-all").then((res) => { this.data.customerOrgType = res.data.items; }); }, diff --git a/src/request/systemapi.js b/src/request/systemapi.js index 5259d65..13d3295 100644 --- a/src/request/systemapi.js +++ b/src/request/systemapi.js @@ -892,7 +892,7 @@ export const sortcommonwords = (data) => { //客户单位类别列表 export const serviceist = (data) => { return request({ - url: "/api/app/customer-org-type/in-filter", + url: "/api/app/customer-org-type/get-all", method: "get", params: data, }); diff --git a/src/views/customerOrg/customerOrg.vue b/src/views/customerOrg/customerOrg.vue index b71a076..51e3414 100644 --- a/src/views/customerOrg/customerOrg.vue +++ b/src/views/customerOrg/customerOrg.vue @@ -49,7 +49,9 @@ export default { }; }, - created() { }, + created() { + + }, //挂载完成 mounted() { }, diff --git a/src/views/customerOrg/customerOrgGroup.vue b/src/views/customerOrg/customerOrgGroup.vue index b0f5b96..34d6490 100644 --- a/src/views/customerOrg/customerOrgGroup.vue +++ b/src/views/customerOrg/customerOrgGroup.vue @@ -259,15 +259,15 @@ export default { //置底 btnSetBottom() { - if (!this.form.id) { + if (!this.dataTransOpts.tableS.customer_org_group.id) { this.$message.warning("请选择操作的数据"); return; } - let lfind = arrayExistObj(this.customerOrgGroups, "id", this.form.id); + let lfind = arrayExistObj(this.customerOrgGroups, "id", this.dataTransOpts.tableS.customer_org_group.id); let currentRow = {}; putapi( - `/api/app/customerorggroup/updatemanysort?id=${this.form.id}&SortType=2` + `/api/app/customerorggroup/updatemanysort?id=${this.dataTransOpts.tableS.customer_org_group.id}&SortType=2` ).then((res) => { console.log("操作成功"); currentRow = this.customerOrgGroups.splice(lfind, 1)[0]; //删除并赋值 @@ -278,16 +278,16 @@ export default { //置顶 btnSetTop() { - if (!this.form.id) { + if (!this.dataTransOpts.tableS.customer_org_group.id) { this.$message.warning("请选择操作的数据"); return; } - let lfind = arrayExistObj(this.customerOrgGroups, "id", this.form.id); + let lfind = arrayExistObj(this.customerOrgGroups, "id", this.dataTransOpts.tableS.customer_org_group.id); let currentRow = {}; putapi( - `/api/app/customerorggroup/updatemanysort?id=${this.form.id}&SortType=1` + `/api/app/customerorggroup/updatemanysort?id=${this.dataTransOpts.tableS.customer_org_group.id}&SortType=1` ).then((res) => { console.log("操作成功"); currentRow = this.customerOrgGroups.splice(lfind, 1)[0];