diff --git a/yxt-as-ui/src/api/Common/dictcommons.js b/yxt-as-ui/src/api/Common/dictcommons.js index 56b627f857..d12fd243e7 100644 --- a/yxt-as-ui/src/api/Common/dictcommons.js +++ b/yxt-as-ui/src/api/Common/dictcommons.js @@ -58,6 +58,14 @@ export function getButtonPermissions(data) { }) } +// 获取集团所有在职人员 +export function selectStaffListss() { + return request({ + url: '/portal/v1/sysstaffinfo/selectStaffListss', + method: 'get' + }) +} + // 根据当前登录用户的全路径查询相应部门下的所有人 export function selAllByOrgSidPath(data) { return request({ diff --git a/yxt-as-ui/src/views/purchase/procurement/procurement.vue b/yxt-as-ui/src/views/purchase/procurement/procurement.vue index 95945f0879..3d93269a3a 100644 --- a/yxt-as-ui/src/views/purchase/procurement/procurement.vue +++ b/yxt-as-ui/src/views/purchase/procurement/procurement.vue @@ -205,7 +205,9 @@ export default { payTypeValue: '', supplierName: '', isInvoicing: '', - orgPath: '' + orgPath: '', + menuUrl: '', + userSid: '' } } } @@ -308,6 +310,8 @@ export default { // 查询列表信息 getList() { this.listLoading = true + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') + this.listQuery.params.menuUrl = this.$route.path this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') req.listPage(this.listQuery).then((response) => { this.listLoading = false @@ -345,7 +349,9 @@ export default { payTypeValue: '', supplierName: '', isInvoicing: '', - orgPath: '' + orgPath: '', + menuUrl: '', + userSid: '' } } this.init() diff --git a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue index c7077e6841..568e173b31 100644 --- a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue +++ b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue @@ -89,10 +89,14 @@ - +
备注
+ +
预计到货日期
+ +
订金及付款申请
@@ -371,11 +375,11 @@ export default { if (res.success) { this.formobj.createOrgSid = res.data this.formobj.useOrgSid = res.data - choiceSupplierInfo({ orgSid: res.data }).then((resp) => { - if (resp.success) { - this.supplier_list = resp.data - } - }) + } + }) + choiceSupplierInfo({ deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => { + if (resp.success) { + this.supplier_list = resp.data } }) }, @@ -490,7 +494,7 @@ export default { selectProducts() { this.viewState = 2 const aa = [] - this.$refs['divSp'].showData(aa, this.formobj.createOrgSid) + this.$refs['divSp'].showData(aa, this.formobj.deptSid) }, backData(value) { this.viewState = 1 @@ -502,7 +506,7 @@ export default { goodSpuSid: e.goodsSpuSid, goodsSpuName: e.goodsSpuName, goodsSkuSid: e.goodsSkuSid, - goodsSkuTitle: '', + goodsSkuTitle: e.goodsSpuName, goodsSkuCode: e.goodsSkuCode, goodsSkuOwnSpec: e.indexes, unit: e.goodsUnitName, diff --git a/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue b/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue index 30bac952bd..46982e5da4 100644 --- a/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue +++ b/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue @@ -66,10 +66,14 @@ - +
备注
{{ formobj.remarks }}
+ +
预计到货日期
+ {{ formobj.deliveryDate }} +
订金及付款申请
diff --git a/yxt-as-ui/src/views/purchase/procurement/relation/chooseproducts.vue b/yxt-as-ui/src/views/purchase/procurement/relation/chooseproducts.vue index f2e1ffcd65..ff36d12283 100644 --- a/yxt-as-ui/src/views/purchase/procurement/relation/chooseproducts.vue +++ b/yxt-as-ui/src/views/purchase/procurement/relation/chooseproducts.vue @@ -76,7 +76,7 @@ export default { current: 1, size: 5, params: { - createOrgSid: '', + useOrgSid: '', goodsSpuName: '', goodsSkuCode: '', manufacturerName: '' @@ -129,7 +129,7 @@ export default { handleSelectionChange(row) { this.sids = row }, - showData(value, createOrgSid) { + showData(value, useOrgSid) { // const aa = [] // if (value.length > 0) { // for (var i = 0; i < value.length; i++) { @@ -139,7 +139,7 @@ export default { // } else { // this.listQuery.params.saleVehSids = [] // }`` - this.listQuery.params.createOrgSid = createOrgSid + this.listQuery.params.useOrgSid = useOrgSid this.listQuery.current = 1 this.listQuery.size = 5 this.listQuery.total = 0 diff --git a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue index 9433e26fac..232f8ffa7e 100644 --- a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue @@ -69,10 +69,14 @@ - +
备注
{{ formobj.remarks }}
+ +
预计到货日期
+ {{ formobj.deliveryDate }} +
订金及付款申请
@@ -201,6 +205,7 @@