fix : 时间选择框为月份
This commit is contained in:
@@ -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="选择月"
|
||||
>
|
||||
</el-date-picker>
|
||||
|
||||
@@ -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: {}
|
||||
|
||||
@@ -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 <span>{getResearchName(row.researchPersonnel)}</span>
|
||||
}
|
||||
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()
|
||||
</script>
|
||||
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
<el-form-item prop="time" :rules="scope.row.time?'1':rules.time">
|
||||
<el-date-picker
|
||||
v-model="scope.row.time"
|
||||
type="date"
|
||||
format="YYYY-MM-DD"
|
||||
value-format="YYYY-MM-DD"
|
||||
type="month"
|
||||
format="YYYY-MM"
|
||||
value-format="YYYY-MM"
|
||||
placeholder="选择时间"
|
||||
>
|
||||
</el-date-picker>
|
||||
@@ -56,7 +56,7 @@
|
||||
<el-table-column prop="afterTax" label="税后余额(元)" width="220">
|
||||
<template #default="scope">
|
||||
<el-form-item prop="afterTax" :rules="scope.row.afterTax?'1':rules.afterTax">
|
||||
<el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额" :controls="false">
|
||||
<el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额" :controls="false">
|
||||
</el-input-number>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user