I'm Irish (for the purposes of this application) and my partner is Chinese. This morning, we went to the Spanish Embassy in Beijing to get him a visa for our holiday in January. We were informed before coming that it would be fine to get a tourist visa for free.
The head of the Embassy Visa Section said that the visa wouldn't be free and we would need to apply at the visa application centre and wait. I got angry and huffed and puffed for a while and he finally agreed. He said this time it was fine, but for the future, he said that I would need to provide a legalized copy of our civil partnership certificate (which was issued at the British Embassy in Vietnam). I asked him how he would like us to do this: he said that I'd have to take it to the British Embassy in Vietnam (where it was issued) to get a certification and then take that certification to the Spanish Embassy in Vietnam to have it legalized. This sounds totally RIDICULOUS! The Embassy of the Netherlands had a quick look at the civil partnership certificate last time and said that everything was ok (within 2 minutes).
Then the Spanish guy at the window (who was nice) asked for the dates that we would stay in Spain. He took my partner's passport, a copy of my passport and a copy of our UK civil partnership certificate and told me that he would call me when the visa was ready.
It only took 20 minutes! However, the dates on the visa were the exact dates that we told him (minus 1 day at the start and an extra day at the end).

Now, the question/issue is this: when I want to go to stay in Spain for longer than a holiday (i.e. if I plan to do Surinder Singh via Spain), can my partner just enter under a normal 'individual tourist visa' as the head of the visa section called it? If this visa expires (as his current one will do 2 weeks after entry), can he still stay in Spain as long as I am there? He won't get in any trouble (as the civil partner of an EEA citizen) as long as I'm there, right?
Thanks so much!
CC