Merge remote-tracking branch 'zcwy/zcwy_1009_bug' into dev_master

This commit is contained in:
nisen
2024-10-09 17:41:01 +08:00
2 changed files with 8 additions and 6 deletions

View File

@@ -26,15 +26,16 @@ const emit = defineEmits(['update:value'])
const store = useStore(); const store = useStore();
const numValue = computed(()=>store.state.project_number.find(item=>item.value == props.value)?.name || null) const numValue = computed(()=>store.state.project_number.find(item=>item.value == props.value)?.name || null)
const handleChange = (value,option)=>{ const handleChange = (value,option)=>{
emit('update:value',value || '') emit('update:value',option?.searchData || '')
} }
onMounted(() => { onMounted(() => {
// console.log(store.state.project_number,'store.state.project_number') // console.log(store.state.project_number,'store.state.project_number')
}); });
const options = computed(()=>store.state.project_number.map(e => { const options = computed(()=>store.state.project_number.map(e => {
return{ return{
value: e.value, value: e.value + e.name,
label: ' 【 ' + e.value + ' 】 ' + e.name label: ' 【 ' + e.value + ' 】 ' + e.name,
searchData: e.value
} }
})) }))
</script> </script>

View File

@@ -147,7 +147,7 @@
<a-radio :style="radioStyle" :value="0"></a-radio> <a-radio :style="radioStyle" :value="0"></a-radio>
</a-radio-group> </a-radio-group>
</div> </div>
<div class="num" v-if="projectInfo.boeFlag === 1"> <div class="num" style="flex:3" v-if="projectInfo.boeFlag === 1">
<div class="num_text">项目编号</div> <div class="num_text">项目编号</div>
<div class="num_input"> <div class="num_input">
<!-- <a-input style="border-radius: 8px;" show-count allowClear maxlength="30" v-model:value="projectInfo.numValue" placeholder="请输入项目编号" /> --> <!-- <a-input style="border-radius: 8px;" show-count allowClear maxlength="30" v-model:value="projectInfo.numValue" placeholder="请输入项目编号" /> -->
@@ -792,15 +792,16 @@ export default {
.num{ .num{
display: flex; display: flex;
justify-content: center; justify-content: left;
align-items: center; align-items: center;
.num_text{ .num_text{
color: #6f6f6f; color: #6f6f6f;
font-size: 14px; font-size: 14px;
min-width: 70px;
// margin-right: 7px; // margin-right: 7px;
} }
.num_input{ .num_input{
width: 184px; width: 100%;
} }
} }