Commit 716eb6c85f348109928b6fce372d689dbff14a92
Merge branch 'zwl-develop' into 'develop'
feat: 搜索栏新增状态查询 See merge request !13
Showing
4 changed files
with
76 additions
and
0 deletions
src/views/project/finance/financeProfit/ProductProfit/InnerData/data.tsx
| @@ -78,6 +78,25 @@ export const searchFormSchema = [ | @@ -78,6 +78,25 @@ export const searchFormSchema = [ | ||
| 78 | }, | 78 | }, |
| 79 | }, | 79 | }, |
| 80 | }, | 80 | }, |
| 81 | + { | ||
| 82 | + field: 'innerProduceStatus', | ||
| 83 | + label: '状态', | ||
| 84 | + component: 'Select', | ||
| 85 | + colProps: { span: 8 }, | ||
| 86 | + | ||
| 87 | + componentProps: { | ||
| 88 | + options: [{ | ||
| 89 | + label: '未完成', | ||
| 90 | + value: -1, | ||
| 91 | + }, { | ||
| 92 | + label: '待审核', | ||
| 93 | + value: 0, | ||
| 94 | + }, { | ||
| 95 | + label: '已完成', | ||
| 96 | + value: 1, | ||
| 97 | + }], | ||
| 98 | + }, | ||
| 99 | + }, | ||
| 81 | ] | 100 | ] |
| 82 | // export const COLUMNS = [ | 101 | // export const COLUMNS = [ |
| 83 | // { | 102 | // { |
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/data.tsx
| @@ -82,6 +82,25 @@ export const searchFormSchema = [ | @@ -82,6 +82,25 @@ export const searchFormSchema = [ | ||
| 82 | showSearch: true, | 82 | showSearch: true, |
| 83 | }, | 83 | }, |
| 84 | }, | 84 | }, |
| 85 | + { | ||
| 86 | + field: 'innerProductionStatus', | ||
| 87 | + label: '状态', | ||
| 88 | + component: 'Select', | ||
| 89 | + colProps: { span: 8 }, | ||
| 90 | + | ||
| 91 | + componentProps: { | ||
| 92 | + options: [{ | ||
| 93 | + label: '未完成', | ||
| 94 | + value: -1, | ||
| 95 | + }, { | ||
| 96 | + label: '待审核', | ||
| 97 | + value: 0, | ||
| 98 | + }, { | ||
| 99 | + label: '已完成', | ||
| 100 | + value: 1, | ||
| 101 | + }], | ||
| 102 | + }, | ||
| 103 | + }, | ||
| 85 | // { | 104 | // { |
| 86 | // field: 'innerNo', | 105 | // field: 'innerNo', |
| 87 | // label: '内部编号', | 106 | // label: '内部编号', |
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/data.tsx
| @@ -78,6 +78,25 @@ export const searchFormSchema = [ | @@ -78,6 +78,25 @@ export const searchFormSchema = [ | ||
| 78 | }, | 78 | }, |
| 79 | }, | 79 | }, |
| 80 | }, | 80 | }, |
| 81 | + { | ||
| 82 | + field: 'packStatus', | ||
| 83 | + label: '状态', | ||
| 84 | + component: 'Select', | ||
| 85 | + colProps: { span: 8 }, | ||
| 86 | + | ||
| 87 | + componentProps: { | ||
| 88 | + options: [{ | ||
| 89 | + label: '未完成', | ||
| 90 | + value: -1, | ||
| 91 | + }, { | ||
| 92 | + label: '待审核', | ||
| 93 | + value: 0, | ||
| 94 | + }, { | ||
| 95 | + label: '已完成', | ||
| 96 | + value: 1, | ||
| 97 | + }], | ||
| 98 | + }, | ||
| 99 | + }, | ||
| 81 | ] | 100 | ] |
| 82 | // export const COLUMNS = [ | 101 | // export const COLUMNS = [ |
| 83 | // { | 102 | // { |
src/views/project/finance/financeProfit/ServiceProfit/ServiceProfit/data.tsx
| @@ -74,6 +74,25 @@ export const searchFormSchema = [ | @@ -74,6 +74,25 @@ export const searchFormSchema = [ | ||
| 74 | }, | 74 | }, |
| 75 | }, | 75 | }, |
| 76 | }, | 76 | }, |
| 77 | + { | ||
| 78 | + field: 'developmentStatus', | ||
| 79 | + label: '状态', | ||
| 80 | + component: 'Select', | ||
| 81 | + colProps: { span: 8 }, | ||
| 82 | + | ||
| 83 | + componentProps: { | ||
| 84 | + options: [{ | ||
| 85 | + label: '未完成', | ||
| 86 | + value: -1, | ||
| 87 | + }, { | ||
| 88 | + label: '待审核', | ||
| 89 | + value: 0, | ||
| 90 | + }, { | ||
| 91 | + label: '已完成', | ||
| 92 | + value: 1, | ||
| 93 | + }], | ||
| 94 | + }, | ||
| 95 | + }, | ||
| 77 | // { | 96 | // { |
| 78 | // field: 'productionDepartment', | 97 | // field: 'productionDepartment', |
| 79 | // label: '生产科', | 98 | // label: '生产科', |