@@ -86,7 +94,7 @@ import req from '@/api/bikerebate/bicyclerebatewithholding'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
-import { brandDown, getOrgSidByPath } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
import bicyclerebatewithholdingAdd from './bicyclerebatewithholdingAdd'
import bicyclerebatewithholdingInfo from './bicyclerebatewithholdingInfo'
import { getStorage } from '@/utils/auth'
@@ -138,14 +146,16 @@ export default {
sids: [],
FormLoading: false,
listLoading: false,
- brand_list: [],
listQuery: {
params: {
useOrgName: '',
+ deptName: '',
createByName: '',
- brandSid: '',
+ billNo: '',
createEndTime: '',
createStartTime: '',
+ finishTimeStart: '',
+ finishTimeEnd: '',
withApply: '',
orgPath: '',
userSid: '',
@@ -201,11 +211,6 @@ export default {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.listQuery.params.createOrgSid = resp.data
- brandDown({ useOrg: this.listQuery.params.createOrgSid }).then((res) => {
- if (res.success) {
- this.brand_list = res.data
- }
- })
this.getList()
}
})
@@ -276,10 +281,13 @@ export default {
this.listQuery = {
params: {
useOrgName: '',
+ deptName: '',
createByName: '',
- brandSid: '',
+ billNo: '',
createEndTime: '',
createStartTime: '',
+ finishTimeStart: '',
+ finishTimeEnd: '',
withApply: '',
orgPath: '',
userSid: '',
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
index 0f55d479de..483b5dd477 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
@@ -22,21 +22,37 @@
金额单位:元
-
-
- 品牌:
-
-
-
-
-
+
+
+ 申请编号
+ {{ formobj.billNo }}
-
- 选择
+
+ 申请日期
+ {{ formobj.createTime }}
+
+
+ 分公司
+ {{ formobj.createOrgName }}
+
+
+ 申请部门
+ {{ formobj.deptName }}
+
+
+ 申请人
+ {{ formobj.createByName }}
+
+
+
+ 选择
+
+
+
@@ -65,7 +81,7 @@
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanlichoose.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanlichoose.vue
index dd6af011d4..94b2b94582 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanlichoose.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanlichoose.vue
@@ -3,16 +3,22 @@