diff --git a/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaoselected.vue b/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaoselected.vue
index 15a7852215..8a5decfda3 100644
--- a/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaoselected.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaoselected.vue
@@ -52,66 +52,35 @@
-
+
- {{ scope.row.purchaseOrderTypeValue }}
+ {{ scope.row.state == '3' ? '是' : '否' }}
+
{{ scope.row.saleOrderNo }}
-
-
- {{ scope.row.saleOrderApproDate }}
-
-
-
-
- {{ scope.row.businessType }}
-
-
-
-
- {{ scope.row.applyDeptName }}
-
-
-
-
- {{ scope.row.applyPeoName }}
-
-
+
+
+
+
{{ scope.row.modelName }}
-
-
- {{ scope.row.configName }}
-
-
-
-
- {{ scope.row.num }}
-
-
+
+
查看
-
-
- {{ scope.row.choiceDate }}
-
-
-
-
- {{ scope.row.operateName }}
-
-
+
+
@@ -127,19 +96,23 @@
-
+
+ 采购渠道
- 选择采购渠道
+
+
+
+ 采购系统
-
-
+
+
@@ -161,7 +134,7 @@ import req from '@/api/purchasingchannels/purchasingchannels'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
-import { getOrgSidByPath, selectOrgLists, typeValues } from '@/api/cheliang/dictcommons'
+import { fetchDetailsByUseOrgSid, getOrgSidByPath, selectOrgLists, typeValues } from '@/api/cheliang/dictcommons'
import { getStorage } from '@/utils/auth'
import saleOrder from '@/components/publicPage/saleOrder'
import vehicleconfiguration from '@/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration'
@@ -204,13 +177,17 @@ export default {
// 查询条件 -----------
tableKey: 0,
list: [],
+ sids: [],
orgDept_list: [],
purchaseOrderType_list: [],
+ purchaseSystem_list: [],
FormLoading: false,
listLoading: false,
formobj: {
purchaseOrderTypeValue: '',
- purchaseOrderTypeKey: ''
+ purchaseOrderTypeKey: '',
+ purchaseSystemName: '',
+ purchaseSystemSid: ''
},
listQuery: {
params: {
@@ -303,6 +280,11 @@ export default {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.listQuery.params.useOrgSid = res.data
+ fetchDetailsByUseOrgSid(res.data).then((res) => {
+ if (res.success) {
+ this.purchaseSystem_list = res.data
+ }
+ })
// 加载列表
this.getList()
}
@@ -322,7 +304,9 @@ export default {
userSid: window.sessionStorage.getItem('userSid'),
orgSidPath: window.sessionStorage.getItem('defaultOrgPath'),
purchaseOrderTypeKey: '',
- purchaseOrderTypeValue: ''
+ purchaseOrderTypeValue: '',
+ purchaseSystemSid: '',
+ purchaseSystemName: ''
})
})
this.sids = aa
@@ -383,16 +367,26 @@ export default {
const choose = this.purchaseOrderType_list.filter((item) => item.dictValue === value)
this.formobj.purchaseOrderTypeKey = choose[0].dictKey
},
+ changeOrgDept(value) {
+ const choose = this.purchaseSystem_list.filter((item) => item.purchaseSystemName === value)
+ this.formobj.purchaseSystemSid = choose[0].deptSid
+ },
handleConfirm() {
if (this.formobj.purchaseOrderTypeValue === '') {
- this.$message({ showClose: true, type: 'error', message: '选择采购渠道不能为空' })
+ this.$message({ showClose: true, type: 'error', message: '采购渠道不能为空' })
+ return
+ }
+ if (this.formobj.purchaseSystemName === '') {
+ this.$message({ showClose: true, type: 'error', message: '采购系统不能为空' })
return
}
for (var i = 0; i < this.sids.length; i++) {
this.sids[i].purchaseOrderTypeValue = this.formobj.purchaseOrderTypeValue
this.sids[i].purchaseOrderTypeKey = this.formobj.purchaseOrderTypeKey
+ this.sids[i].purchaseSystemName = this.formobj.purchaseSystemName
+ this.sids[i].purchaseSystemSid = this.formobj.purchaseSystemSid
}
- const tip = '请确认采购渠道是否选择正确'
+ const tip = '请确认采购渠道以及采购系统是否选择正确'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -410,7 +404,9 @@ export default {
handleQuXiao() {
this.formobj = {
purchaseOrderTypeValue: '',
- purchaseOrderTypeKey: ''
+ purchaseOrderTypeKey: '',
+ purchaseSystemName: '',
+ purchaseSystemSid: ''
}
this.dialogVisible = false
},
@@ -444,4 +440,10 @@ export default {
color: white;
font-weight: 600;
}
+.span-sty {
+ width: 130px !important;
+}
+.addinputInfo {
+ margin-left: 120px !important;
+}
diff --git a/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue b/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue
index 533878f33b..38e956600c 100644
--- a/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue
@@ -114,19 +114,23 @@
-
+
+ 采购渠道
- 选择采购渠道
+
+
+
+ 采购系统
-
-
+
+
@@ -145,7 +149,7 @@