diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 055b107..6fe222d 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -14,7 +14,7 @@
v-model="formData.apportionmentMonth"
type="month"
format="YYYY-MM"
- value-format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM"
placeholder="选择月"
>
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 7d4ae3b..4e55864 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -119,8 +119,10 @@ const searchConfig = reactive([
prop: 'time',
component: 'el-date-picker',
props: {
- placeholder: '请选择时间',
+ type:'month',
+ placeholder: '请选择月份',
clearable: true,
+ format: 'YYYY-MM',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
colProps: {}
diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue
index d37b65e..d7a1a4c 100644
--- a/src/views/project-management/implementation/share.vue
+++ b/src/views/project-management/implementation/share.vue
@@ -37,35 +37,23 @@ const schema = computed(() => {
const baseForm = ref()
const searchConfig = reactive([
{
- label: '关键词',
- prop: 'requirementName',
+ label: '项目人员',
+ prop: 'researchPersonnel',
component: 'el-input',
props: {
- placeholder: '请输入关键词查询',
- clearable: true,
- filterable: true,
- checkStrictly: true
- }
- },
- {
- label: '项目人员',
- prop: 'projectCost',
- component: shallowRef(fvSelect),
- props: {
- placeholder: '请选择项目人员查询',
- clearable: true,
- filterable: true,
- checkStrictly: true,
- cacheKey: ''
+ placeholder: '请输入项目人员查询'
}
},
{
label: '时间',
- prop: 'datetime',
+ prop: 'time',
component: 'el-date-picker',
props: {
- placeholder: '请选择时间',
+ type:'month',
+ placeholder: '请选择月份',
clearable: true,
+ format: 'YYYY-MM',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
}
}
])
@@ -87,10 +75,7 @@ const tableConfig = reactive({
{
prop: 'researchPersonnel',
label: '研发人员',
- align: 'center',
- currentRender:({row})=>{
- return {getResearchName(row.researchPersonnel)}
- }
+ align: 'center'
},
{
prop: 'wagesPayable',
@@ -138,21 +123,25 @@ const tableConfig = reactive({
projectId: route.query.id
}
})
-const researchOptions = ref([])
-const getResearchOptions = async () => {
- const res = await getResearchUser()
- researchOptions.value = res.data
-}
-const getResearchName=(id)=>{
- if(!id)return;
- let label=''
- researchOptions.value.forEach(item=>{
- if(item.value==id){
- label=item.label
- }
- })
- return label
+const search = (val) => {
+ tableConfig.params = {...val, projectId: route.query.id}
+ tableIns.value.refresh()
}
+// const researchOptions = ref([])
+// const getResearchOptions = async () => {
+// const res = await getResearchUser()
+// researchOptions.value = res.data
+// }
+// const getResearchName=(id)=>{
+// if(!id)return;
+// let label=''
+// researchOptions.value.forEach(item=>{
+// if(item.value==id){
+// label=item.label
+// }
+// })
+// return label
+// }
const getBaseInfo = async () => {
try {
const {code, data} = await getBaseInfoApi(route.query.id)
@@ -161,7 +150,7 @@ const getBaseInfo = async () => {
}
}
-getResearchOptions()
+// getResearchOptions()
getBaseInfo()
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index f3c2d48..656e936 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -8,9 +8,9 @@
@@ -56,7 +56,7 @@
-
+