From 47c3078a857e4a8300fa70402c290abbd0c87fa7 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 30 Sep 2022 17:31:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6=E9=87=87?=
=?UTF-8?q?=E8=B4=AD=E5=A2=9E=E5=8A=A0=E9=87=87=E8=B4=AD=E7=B3=BB=E7=BB=9F?=
=?UTF-8?q?=E3=80=81=E5=8E=82=E5=AE=B6=E9=94=80=E5=94=AE=E9=80=9A=E8=B7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/api/cheliang/dictcommons.js | 10 +++
.../src/api/supplychain/busvehicleapply.js | 18 ++---
.../cheliangpaichan/cheliangpaichanAdd.vue | 67 ++++++++++++++++--
.../cheliangpaichan/cheliangpaichanInfo.vue | 15 +++-
.../cheliangpaichanDaiBanInfo.vue | 15 +++-
.../paichanguanli/cheliangpaichanEdit.vue | 68 +++++++++++++++++--
.../cheliangpaichanYiBanInfo.vue | 15 +++-
7 files changed, 177 insertions(+), 31 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 256907d3ff..c7486cd2f8 100644
--- a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
+++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
@@ -128,3 +128,13 @@ export function selectMiddleList(data) {
})
}
+// 获取分公司下所有的部门
+export function selectOrgLists(data) {
+ return request({
+ url: '/portal/v1/sysorganization/selectOrgLists',
+ method: 'GET',
+ params: data
+ })
+}
+
+
diff --git a/anrui-scm/anrui-scm-ui/src/api/supplychain/busvehicleapply.js b/anrui-scm/anrui-scm-ui/src/api/supplychain/busvehicleapply.js
index d03680d8c8..71df779740 100644
--- a/anrui-scm/anrui-scm-ui/src/api/supplychain/busvehicleapply.js
+++ b/anrui-scm/anrui-scm-ui/src/api/supplychain/busvehicleapply.js
@@ -136,18 +136,12 @@ export default {
params: data
})
},
- // 读取xml文件
- readXml: function(deployId) {
+ // 获取厂家销售通路
+ selectNameByOrg: function(data) {
return request({
- url: '/flowable/v1/flowable/task/readXml/' + deployId,
- method: 'get'
- })
- },
- // 读取image文件
- getFlowViewer: function(procInsId) {
- return request({
- url: '/flowable/v1/flowable/task/flowViewer/' + procInsId,
- method: 'get'
+ url: '/base/v1/basemanufacturer/selectNameByOrg',
+ method: 'get',
+ params: data
})
- },
+ }
}
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
index 9510eabb46..a1f48ca8aa 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
@@ -20,15 +20,23 @@
厂家采购
-
+
分公司:
{{ formobj.createOrgName }}
-
+
+ 采购系统:
+
+
+
+
+
+
+
申请人:
{{ formobj.createByName }}
-
+
申请日期:
{{ formobj.applicationDate }}
@@ -119,6 +127,13 @@
{{ scope.row.saleGuPrice }}
+
+
+
+
+
+
+
@@ -152,7 +167,7 @@ import req from '@/api/supplychain/busvehicleapply'
import configuration from './chexingbyconfiguration'
import shangzhuangpeizhi from '../../../views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhi'
import shangzhuangpeizhiAdd from '../../../views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiAdd'
-import { getPathSidByUserSid, fetchBySid, selectSysUserList } from '@/api/cheliang/dictcommons'
+import { getPathSidByUserSid, fetchBySid, selectSysUserList, selectOrgLists } from '@/api/cheliang/dictcommons'
export default {
name: 'cheliangpaichanAdd',
@@ -169,6 +184,8 @@ export default {
index: 0,
tableKey: 0,
// 下拉框
+ orgDept_list: [],
+ actualPay_list: [],
schedulingType_list: [], // 排产订金使用
applyType_list: [],
user_list: [],
@@ -195,6 +212,8 @@ export default {
createOrgName: '',
userSids: '', // 销售经理sid
userNames: '', // 销售经理name
+ orgDeptName: '',
+ orgDeptSid: '',
busVehicleApplyDetailList: []
},
rules: {},
@@ -220,6 +239,11 @@ export default {
})
},
getUserOrg() {
+ selectOrgLists({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+ if (res.success) {
+ this.orgDept_list = res.data
+ }
+ })
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
if (resp.success) {
this.formobj.createOrgSid = resp.data
@@ -228,6 +252,11 @@ export default {
this.formobj.createOrgName = response.data.name
}
})
+ req.selectNameByOrg({ useOrgSid: resp.data }).then((res) => {
+ if (res.success) {
+ this.actualPay_list = res.data
+ }
+ })
}
})
},
@@ -315,7 +344,9 @@ export default {
insideCode: e.insideCode, // 内部编码
vehicleName: e.vehicleAlias,
vehicleSid: e.modelSid,
- guidePrice: ''
+ guidePrice: '',
+ actualPay: '',
+ actualSid: ''
})
if (e.insideCode) {
this.isRead = true
@@ -325,6 +356,30 @@ export default {
})
}
},
+ changeOrgDept(value) {
+ let bb = null
+ this.orgDept_list.forEach((e) => {
+ if (e.name === value) {
+ bb = {
+ name: e.orgDeptName,
+ sid: e.orgDeptSid
+ }
+ }
+ })
+ this.formobj.orgDeptSid = bb.sid
+ },
+ changeActualPay(value, row) {
+ let bb = null
+ this.actualPay_list.forEach((e) => {
+ if (e.name === value) {
+ bb = {
+ name: e.name,
+ sid: e.sid
+ }
+ }
+ })
+ row.actualSid = bb.sid
+ },
changeApplyType(value) {
let bb = null
this.applyType_list.forEach((e) => {
@@ -503,6 +558,8 @@ export default {
this.formobj.createOrgName = ''
this.formobj.userNames = ''
this.formobj.userSids = ''
+ this.formobj.orgDeptName = ''
+ this.formobj.orgDeptSid = ''
this.user_list = []
this.formobj.busVehicleApplyDetailList = []
this.$refs['form_obj'].resetFields()
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
index f1a73ee4be..382e55dc0c 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
@@ -16,15 +16,19 @@
厂家采购
-
+
分公司:
{{ formobj.createOrgName }}
-
+
+ 采购系统:
+ {{ formobj.orgDeptName }}
+
+
申请人:
{{ formobj.createByName }}
-
+
申请日期:
{{ formobj.applicationDate }}
@@ -96,6 +100,11 @@
{{ scope.row.saleGuPrice }}
+
+
+ {{ scope.row.actualPay }}
+
+
{{ scope.row.remarks }}
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
index 1b3114b937..746a8742bf 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
@@ -18,15 +18,19 @@
厂家采购
-
+
分公司:
{{ formobj.createOrgName }}
-
+
+ 采购系统:
+ {{ formobj.orgDeptName }}
+
+
申请人:
{{ formobj.createByName }}
-
+
申请日期:
{{ formobj.applicationDate }}
@@ -98,6 +102,11 @@
{{ scope.row.saleGuPrice }}
+
+
+ {{ scope.row.actualPay }}
+
+
{{ scope.row.remarks }}
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
index a98fff7127..5220f52c9b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
@@ -19,15 +19,23 @@
排产申请
-
+
分公司:
{{ formobj.createOrgName }}
-
+
+ 采购系统:
+
+
+
+
+
+
+
申请人:
{{ formobj.createByName }}
-
+
申请日期:
{{ formobj.applicationDate }}
@@ -118,6 +126,13 @@
{{ scope.row.saleGuPrice }}
+
+
+
+
+
+
+
@@ -151,7 +166,7 @@ import req from '@/api/supplychain/busvehicleapply'
import configuration from './chexingbyconfiguration'
import shangzhuangpeizhi from '../../../workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shuangzhuangpeizhi'
import shangzhuangpeizhiAdd from '../../../workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiAdd'
-import { selectSysUserList } from '@/api/cheliang/dictcommons'
+import { selectSysUserList, selectOrgLists } from '@/api/cheliang/dictcommons'
export default {
name: 'cheliangpaichanEdit',
@@ -168,6 +183,8 @@ export default {
index: 0,
tableKey: 0,
// 下拉框
+ orgDept_list: [],
+ actualPay_list: [],
schedulingType_list: [], // 排产订金使用
applyType_list: [],
user_list: [],
@@ -194,6 +211,8 @@ export default {
createOrgName: '',
userSids: '', // 销售经理sid
userNames: '', // 销售经理name
+ orgDeptName: '',
+ orgDeptSid: '',
busVehicleApplyDetailList: []
},
rules: {},
@@ -236,6 +255,18 @@ export default {
this.user_list = resp.data
}
})
+ selectOrgLists({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+ if (res.success) {
+ this.orgDept_list = res.data
+ }
+ })
+ },
+ init() {
+ req.selectNameByOrg({ useOrgSid: this.formobj.createOrgSid }).then((res) => {
+ if (res.success) {
+ this.actualPay_list = res.data
+ }
+ })
},
oninput(val, limit = 0) {
val = val.replace(/[^\d]/g, '') // 保留数字
@@ -264,6 +295,7 @@ export default {
showInfo(sid, row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
+ this.init()
})
this.dialogStatus = 'edit'
this.viewTitle = '【编辑】厂家采购'
@@ -294,7 +326,9 @@ export default {
insideCode: e.insideCode, // 内部编码
vehicleName: e.vehicleAlias,
vehicleSid: e.modelSid,
- guidePrice: ''
+ guidePrice: '',
+ actualPay: '',
+ actualSid: ''
})
if (e.insideCode) {
this.isRead = true
@@ -304,6 +338,30 @@ export default {
})
}
},
+ changeOrgDept(value) {
+ let bb = null
+ this.orgDept_list.forEach((e) => {
+ if (e.name === value) {
+ bb = {
+ name: e.orgDeptName,
+ sid: e.orgDeptSid
+ }
+ }
+ })
+ this.formobj.orgDeptSid = bb.sid
+ },
+ changeActualPay(value, row) {
+ let bb = null
+ this.actualPay_list.forEach((e) => {
+ if (e.name === value) {
+ bb = {
+ name: e.name,
+ sid: e.sid
+ }
+ }
+ })
+ row.actualSid = bb.sid
+ },
changeApplyType(value) {
let bb = null
this.applyType_list.forEach((e) => {
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
index 120a8b2a10..7c63ac45ad 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
@@ -16,15 +16,19 @@
厂家采购
-
+
分公司:
{{ formobj.createOrgName }}
-
+
+ 采购系统:
+ {{ formobj.orgDeptName }}
+
+
申请人:
{{ formobj.createByName }}
-
+
申请日期:
{{ formobj.applicationDate }}
@@ -96,6 +100,11 @@
{{ scope.row.saleGuPrice }}
+
+
+ {{ scope.row.actualPay }}
+
+
{{ scope.row.remarks }}