From 87393ba597f833b634a643ee335650394ef78eae Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 6 Dec 2022 15:35:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=AE=80=E6=98=93?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xunidingdanFlow/cheliangyudingEdit.vue | 27 +++++++++---------- .../xunidingdanFlow/dingjinshouquEdit.vue | 10 +++---- .../relation/xuanzecheliang.vue | 5 +--- .../xunidingdan/com/xuanzecheliang.vue | 5 +--- .../xunidingdan/xunidingdanAdd.vue | 27 +++++-------------- .../xunidingdan/xunidingjinAdd.vue | 19 +++++-------- 6 files changed, 31 insertions(+), 62 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyudingEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyudingEdit.vue index 365af9e6bd..7e863e2859 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyudingEdit.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyudingEdit.vue @@ -4,8 +4,8 @@
{{ viewTitle }}
- 保存 - 提交 + 保存 + 提交
@@ -81,7 +81,7 @@ @@ -257,10 +257,8 @@ export default { this.temp.staffSid = window.sessionStorage.getItem('staffSid') this.temp.orgSid = window.sessionStorage.getItem('orgSid') saveChe(this.temp).then((response) => { - this.FormLoading = true - if (response.code === '200') { - this.FormLoading = false - this.$message({ showClose: true, type: 'success', message: '提交成功' }) + if (response.success) { + this.$message({ showClose: true, type: 'success', message: '保存成功' }) // 子页面向父级页面传递值 window.parent.postMessage({ cmd: 'returnHeight', @@ -269,6 +267,8 @@ export default { code: 1 } }, '*') + } else { + this.submitdisabled = false } }) } @@ -301,13 +301,8 @@ export default { console.log('提交时sid', this.temp.sid) // 提交流程 submitVehicleApprove(this.temp).then((response) => { - if (response.code === '200') { - this.$notify({ - title: '提示', - message: '提交成功', - type: 'success', - duration: 2000 - }) + if (response.success) { + this.$message({ showClose: true, type: 'success', message: '提交成功' }) // 子页面向父级页面传递值 window.parent.postMessage({ cmd: 'returnHeight', @@ -316,6 +311,8 @@ export default { code: 1 } }, '*') + } else { + this.submitdisabled = false } }) } @@ -349,7 +346,7 @@ export default { } }, // 删除一行 - handleDelete(row, index) { + handleDelete(index) { this.temp.carList.splice(index, 1) }, // ------------ 页面跳转以及数据获取 ------------ diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue index 9784e3af22..f8df25ce4c 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue @@ -447,7 +447,7 @@ export default { this.temp.userSid = window.sessionStorage.getItem('userSid') saveDing(this.temp).then((response) => { if (response.success) { - this.$message({ showClose: true, type: 'success', message: '修改成功' }) + this.$message({ showClose: true, type: 'success', message: '保存成功' }) // 子页面向父级页面传递值 window.parent.postMessage({ cmd: 'returnHeight', @@ -456,6 +456,8 @@ export default { code: 1 } }, '*') + } else { + this.submitdisabled = false } }) } @@ -496,11 +498,7 @@ export default { } }, '*') } else { - this.$notify({ - title: '提交失败', - message: response.msg, - type: 'error' - }) + this.submitdisabled = false } }) } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzecheliang.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzecheliang.vue index 3e69a369ec..2310e1da38 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzecheliang.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzecheliang.vue @@ -154,10 +154,8 @@ export default { } else { this.listQuery.params.vinNoList = [] } - this.listQuery.current = 1 - this.listQuery.total = 0 - this.listQuery.size = 5 this.getcarbrand() + this.handleReset() }, // 搜索条件效果 clicksearchShow() { @@ -213,7 +211,6 @@ export default { }) } }) - this.getList() }, // 确认 handleConfirm() { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzecheliang.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzecheliang.vue index 22c45373e6..85549c5c93 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzecheliang.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzecheliang.vue @@ -154,10 +154,8 @@ export default { } else { this.listQuery.params.vinNoList = [] } - this.listQuery.current = 1 - this.listQuery.total = 0 - this.listQuery.size = 5 this.getcarbrand() + this.handleReset() }, // 搜索条件效果 clicksearchShow() { @@ -213,7 +211,6 @@ export default { }) } }) - this.getList() }, // 确认 handleConfirm() { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanAdd.vue index 0a9d6aefa5..bc8e25771b 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanAdd.vue @@ -82,7 +82,7 @@ @@ -260,15 +260,11 @@ export default { this.temp.staffSid = window.sessionStorage.getItem('staffSid') this.temp.orgSid = window.sessionStorage.getItem('orgSid') saveChe(this.temp).then((response) => { - if (response.code === '200') { + if (response.success) { + this.$message({ showClose: true, type: 'success', message: '保存成功' }) this.handleReturn('true') } else { - this.$notify({ - title: '提示', - message: '添加失败', - type: 'error', - duration: 2000 - }) + this.submitdisabled = false } }) } @@ -305,20 +301,11 @@ export default { console.log('提交时sid', this.temp.sid) // 提交流程 submitVehicleApprove(this.temp).then((response) => { - if (response.code === '200') { - this.$notify({ - title: '提示', - message: '提交成功', - type: 'success', - duration: 2000 - }) + if (response.success) { + this.$message({ showClose: true, type: 'success', message: '提交成功' }) this.handleReturn('true') } else { - this.$notify({ - title: '提交失败', - message: response.msg, - type: 'error' - }) + this.submitdisabled = false } }) } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue index 9622babf4c..e403b79102 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue @@ -449,15 +449,11 @@ export default { this.temp.orgSid = window.sessionStorage.getItem('orgSid') this.temp.userSid = window.sessionStorage.getItem('userSid') saveDing(this.temp).then((response) => { - if (response.code === '200') { + if (response.success) { + this.$message({ showClose: true, type: 'success', message: '保存成功' }) this.handleReturn('true') } else { - this.$notify({ - title: '提示', - message: '添加失败', - type: 'error', - duration: 2000 - }) + this.submitdisabled = false } }) } @@ -487,14 +483,11 @@ export default { this.temp.userSid = window.sessionStorage.getItem('userSid') // 提交流程 submitApprove(this.temp).then((response) => { - if (response.code === '200') { + if (response.success) { + this.$message({ showClose: true, type: 'success', message: '提交成功' }) this.handleReturn('true') } else { - this.$notify({ - title: '提交失败', - message: response.msg, - type: 'error' - }) + this.submitdisabled = false } }) } From 119b086801dc42442b62a42e3dbc2838c63ac805 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 6 Dec 2022 15:40:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86--=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E6=89=80=E5=B1=9E=E5=88=86=E5=85=AC=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js | 8 ++++++++ .../anrui-scm-ui/src/views/cheliang/chexing/chexing.vue | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js index ba49bbdcc4..45cecb2972 100644 --- a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js +++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js @@ -51,6 +51,14 @@ export function getListOrgByBrandSid(orgSid, brandSid) { }) } +// 根据当前登录人的分公司sid和品牌sid信息获取分公司 +export function getListOrgByBrandSidNo(orgSid, brandSid) { + return request({ + url: '/portal/v1/sysorganization/getListOrgByBrandSidNo/' + orgSid + '/' + brandSid, + method: 'get' + }) +} + // 根据登陆人sid查询分公司 （孟哲写的接口） export function getPathSidByUserSid(data) { return request({ diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue index 8f89b92dbc..2b66151c8e 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue @@ -198,7 +198,7 @@ import chexinglook from './chexinglook' import chexingpeizhi from './relation/chexingguanlianchangyong' import chexinggonggaoxingao from './relation/chexinggonggaoxingao' import upload from '../../../components/uploadFile/upload_chexing' -import { getListOrgByBrandSid } from '@/api/cheliang/dictcommons' +import { getListOrgByBrandSidNo } from '@/api/cheliang/dictcommons' export default { name: 'chexing', @@ -385,7 +385,7 @@ export default { }) }, changeBrand(value) { - getListOrgByBrandSid(this.listQuery.params.createOrgSId, value).then((resp) => { + getListOrgByBrandSidNo(this.listQuery.params.createOrgSId, value).then((resp) => { if (resp.success) { this.org_list = resp.data }